0002721: Null Pointer on Initial load,

synchronize the sequence service
JumpMind · Aug 12, 2016 · f9d3de2 · f9d3de2
1 parent 0cb0e6e
commit f9d3de2
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/SequenceService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/SequenceService.java
@@ -84,21 +84,21 @@ private void initSequence(String name, long initialValue, int cacheSize) {
         }
     }
 
-    public long nextVal(String name) {
+    public synchronized long nextVal(String name) {
         if (getSequenceDefinition(name).getCacheSize() > 0) {
             return nextValFromCache(null, name);
         }
         return nextValFromDatabase(name);
     }
 
-    public long nextVal(ISqlTransaction transaction, String name) {
+    public synchronized long nextVal(ISqlTransaction transaction, String name) {
         if (getSequenceDefinition(transaction, name).getCacheSize() > 0) {
             return nextValFromCache(transaction, name);
         }
         return nextValFromDatabase(transaction, name);
     }
 
-    protected synchronized long nextValFromCache(ISqlTransaction transaction, String name) {
+    protected long nextValFromCache(ISqlTransaction transaction, String name) {
         CachedRange range = sequenceCache.get(name);
         if (range != null) {
             long currentValue = range.getCurrentValue();
@@ -208,15 +208,15 @@ protected Sequence getSequenceDefinition(ISqlTransaction transaction, String nam
         return sequence;
     }
 
-    public long currVal(ISqlTransaction transaction, String name) {
+    public synchronized long currVal(ISqlTransaction transaction, String name) {
         CachedRange range = sequenceCache.get(name);
         if (range != null) {
             return range.getCurrentValue();
         }
         return transaction.queryForLong(getSql("getCurrentValueSql"), name);
     }
 
-    public long currVal(final String name) {
+    public synchronized long currVal(final String name) {
         CachedRange range = sequenceCache.get(name);
         if (range != null) {
             return range.getCurrentValue();