From: Giovanni Meo <gmeo@cisco.com>
Date: Mon, 12 May 2014 11:05:43 +0000 (+0000)
Subject: Merge "Bug 849: Fixed NPE in Translated Data Change Events."
X-Git-Tag: autorelease-tag-v20140601202136_82eb3f9~102
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=494d528befd3908cc1b5f1c7706d34414819ef03;hp=-c

Merge "Bug 849: Fixed NPE in Translated Data Change Events."
---

494d528befd3908cc1b5f1c7706d34414819ef03
diff --combined opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedDataBroker.java
index fa48416484,6982a72969..5155e42b82
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedDataBroker.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedDataBroker.java
@@@ -99,7 -99,7 +99,7 @@@ public abstract class AbstractForwarded
                  Entry<InstanceIdentifier<? extends DataObject>, DataObject> binding = getCodec().toBinding(entry);
                  newMap.put(binding.getKey(), binding.getValue());
              } catch (DeserializationException e) {
 -                LOG.debug("Omitting {}", entry, e);
 +                LOG.warn("Failed to transform {}, omitting it", entry, e);
              }
          }
          return newMap;
@@@ -113,7 -113,7 +113,7 @@@
                  InstanceIdentifier<? extends DataObject> binding = getCodec().toBinding(normalizedPath);
                  hashSet.add(binding);
              } catch (DeserializationException e) {
 -                LOG.debug("Omitting {}", normalizedPath, e);
 +                LOG.warn("Failed to transform {}, omitting it", normalizedPath, e);
              }
          }
          return hashSet;
@@@ -207,7 -207,11 +207,11 @@@
          @Override
          public DataObject getOriginalSubtree() {
              if (originalDataCache == null) {
-                 originalDataCache = toBindingData(path, domEvent.getOriginalSubtree());
+                 if(domEvent.getOriginalSubtree() != null) {
+                     originalDataCache = toBindingData(path, domEvent.getOriginalSubtree());
+                 } else {
+                     originalDataCache = Optional.absent();
+                 }
              }
              return originalDataCache.orNull();
          }
@@@ -215,9 -219,12 +219,12 @@@
          @Override
          public DataObject getUpdatedSubtree() {
              if (updatedDataCache == null) {
-                 updatedDataCache = toBindingData(path, domEvent.getUpdatedSubtree());
+                 if(domEvent.getUpdatedSubtree() != null) {
+                     updatedDataCache = toBindingData(path, domEvent.getUpdatedSubtree());
+                 } else {
+                     updatedDataCache = Optional.absent();
+                 }
              }
- 
              return updatedDataCache.orNull();
          }