Author: pats
Date: Thu Feb 10 05:41:30 2011
New Revision: 1069239
URL: http://svn.apache.org/viewvc?rev=1069239&view=rev
Log:
Synchronize all incrementing of nextID on the class containing the nextID field.
Modified:
incubator/river/jtsk/skunk/patsOutrigger/qa/src/com/sun/jini/test/impl/outrigger/matching/NBEUniqueEntry.java
incubator/river/jtsk/skunk/patsOutrigger/qa/src/com/sun/jini/test/impl/outrigger/matching/UniqueEntry.java
Modified:
incubator/river/jtsk/skunk/patsOutrigger/qa/src/com/sun/jini/test/impl/outrigger/matching/NBEUniqueEntry.java
URL:
http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsOutrigger/qa/src/com/sun/jini/test/impl/outrigger/matching/NBEUniqueEntry.java?rev=1069239&r1=1069238&r2=1069239&view=diff
==============================================================================
---
incubator/river/jtsk/skunk/patsOutrigger/qa/src/com/sun/jini/test/impl/outrigger/matching/NBEUniqueEntry.java
(original)
+++
incubator/river/jtsk/skunk/patsOutrigger/qa/src/com/sun/jini/test/impl/outrigger/matching/NBEUniqueEntry.java
Thu Feb 10 05:41:30 2011
@@ -128,13 +128,14 @@ public class NBEUniqueEntry implements n
originatingHostVM = ourVMName;
// Grab nextID
- int id;
- synchronized (getClass()) {
- id = nextID++;
- }
+ int id = getID();
entryID = new Integer(id);
}
+ private static synchronized int getID() {
+ return nextID++;
+ }
+
/**
* Create a new <code>UniqueEntry</code> that can service as a
* template to retrieve the passed UniqueEntry (or subclass) from
@@ -144,4 +145,12 @@ public class NBEUniqueEntry implements n
originatingHostVM = entry.originatingHostVM;
entryID = entry.entryID;
}
+
+ @Override
+ public String toString() {
+ return "NBEUniqueEntry [entryID=" + entryID + ", originatingHostVM="
+ + originatingHostVM + ", toString()=" + super.toString() + "]";
+ }
+
+
}
Modified:
incubator/river/jtsk/skunk/patsOutrigger/qa/src/com/sun/jini/test/impl/outrigger/matching/UniqueEntry.java
URL:
http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsOutrigger/qa/src/com/sun/jini/test/impl/outrigger/matching/UniqueEntry.java?rev=1069239&r1=1069238&r2=1069239&view=diff
==============================================================================
---
incubator/river/jtsk/skunk/patsOutrigger/qa/src/com/sun/jini/test/impl/outrigger/matching/UniqueEntry.java
(original)
+++
incubator/river/jtsk/skunk/patsOutrigger/qa/src/com/sun/jini/test/impl/outrigger/matching/UniqueEntry.java
Thu Feb 10 05:41:30 2011
@@ -122,12 +122,11 @@ public class UniqueEntry extends net.jin
}
originatingHostVM = ourVMName;
- // Grab nextID
- int id;
- synchronized (getClass()) {
- id = nextID++;
- }
- entryID = new Integer(id);
+ entryID = new Integer(getID());
+ }
+
+ private static synchronized int getID() {
+ return nextID++;
}
/**
