Reverting change to IdBlockGenerator that caused NPE when installing flows.

Change-Id: I86ff72d0cd4560dec2c2a1ce4bf97473d36447bf

Reverting change to IdBlockGenerator that caused NPE when installing flows.
Change-Id: I86ff72d0cd4560dec2c2a1ce4bf97473d36447bf
alshabib
Commit 5f5d281432c9f28465ebdce4b23470d0b23134e7 5f5d2814 1 parent e1200590
Showing 1 changed file with 8 additions and 10 deletions
core/net/src/main/java/org/onosproject/core/impl/BlockAllocatorBasedIdGenerator.java
--- a/core/net/src/main/java/org/onosproject/core/impl/BlockAllocatorBasedIdGenerator.java
View file @5f5d281
+++ b/core/net/src/main/java/org/onosproject/core/impl/BlockAllocatorBasedIdGenerator.java
View file @5f5d281
@@ -46,22 +46,20 @@ public class BlockAllocatorBasedIdGenerator implements IdGenerator {
     @Override
     public long getNewId() {
         try {
+             if (!initialized.get()) {
+                 synchronized (allocator) {
+                     if (!initialized.get()) {
+                         idBlock = allocator.allocateUniqueIdBlock();
+                         initialized.set(true);
+                     }
+                 }
+             }
             return idBlock.getNextId();
         } catch (UnavailableIdException e) {
             synchronized (allocator) {
                 idBlock = allocator.allocateUniqueIdBlock();
             }
             return idBlock.getNextId();
-         } catch (NullPointerException e) {
-             synchronized (allocator) {
-                 if (!initialized.get()) {
-                     idBlock = allocator.allocateUniqueIdBlock();
-                     initialized.set(true);
-                     return idBlock.getNextId();
-                 } else {
-                     throw e;
-                 }
-             }
         }
     }
 }