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

diff --combined opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedDataBroker.java
index fa4841648409cd80fa868f25ecd7d04c8fbf367e,6982a72969f37a7ac3abc675ca8617a24338f337..5155e42b82c2c1feb023117cb4a33379effc5de1
--- 1/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedDataBroker.java
--- 2/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();
          }