commit d85643d75526168c9a3e5c6a539e801d4cc77cf3
author Andreas Wundsam <andreas.wundsam@bigswitch.com> Mon Oct 21 08:25:29 2013 -0700
committer Andreas Wundsam <andreas.wundsam@bigswitch.com> Mon Oct 21 08:25:29 2013 -0700
tree ddbf780c778d01f08b4d26eb852662649f62db7e
parent 73e2ec4677962f900f038f1ba6709ad1bbb8ee97
parent f497b07545d808dd62caef1ad325d9e229f99981

Merge branch 'master' of github.com:floodlight/loxigen into funnel

Conflicts:
	java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/DatapathId.java

java_gen/pre-written/pom.xml

diff --git a/java_gen/pre-written/pom.xml b/java_gen/pre-written/pom.xml
index eb0b2ed..5715704 100644
--- a/java_gen/pre-written/pom.xml
+++ b/java_gen/pre-written/pom.xml
@@ -37,12 +37,12 @@
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>annotations</artifactId>
-            <version>2.0.1</version>
+            <version>2.0.2</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.2</version>
+            <version>4.11</version>
             <scope>test</scope>
         </dependency>
         <dependency>

java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/DatapathId.java

diff --git a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/DatapathId.java b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/DatapathId.java
index 1908d28..79fa14f 100644
--- a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/DatapathId.java
+++ b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/DatapathId.java
@@ -1,5 +1,6 @@
 package org.projectfloodlight.openflow.types;
 
+import org.projectfloodlight.openflow.annotations.Immutable;
 import org.projectfloodlight.openflow.util.HexString;
 
 import com.google.common.hash.PrimitiveSink;
@@ -8,10 +9,11 @@
 
 /**
  * Abstraction of a datapath ID that can be set and/or accessed as either a
- * long value or a colon-separated string.
+ * long value or a colon-separated string. Immutable
  *
  * @author Rob Vaterlaus <rob.vaterlaus@bigswitch.com>
  */
+@Immutable
 public class DatapathId implements PrimitiveSinkable, Comparable<DatapathId> {
 
     public static final DatapathId NONE = new DatapathId(0);