You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@chemistry.apache.org by fm...@apache.org on 2012/02/17 12:22:44 UTC

svn commit: r1245398 - /chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java

Author: fmui
Date: Fri Feb 17 11:22:44 2012
New Revision: 1245398

URL: http://svn.apache.org/viewvc?rev=1245398&view=rev
Log:
Browser Binding: fixed NPE

Modified:
    chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java

Modified: chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java?rev=1245398&r1=1245397&r2=1245398&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java (original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-server/chemistry-opencmis-server-bindings/src/main/java/org/apache/chemistry/opencmis/server/impl/browser/BrowserBindingUtils.java Fri Feb 17 11:22:44 2012
@@ -240,9 +240,9 @@ public class BrowserBindingUtils {
 
             PropertyData<?> propertyData = null;
 
-            if (singleValuePropertyMap.containsKey(i)) {
+            if (singleValuePropertyMap != null && singleValuePropertyMap.containsKey(i)) {
                 propertyData = createPropertyData(propDef, singleValuePropertyMap.get(i));
-            } else if (multiValuePropertyMap.containsKey(i)) {
+            } else if (multiValuePropertyMap != null && multiValuePropertyMap.containsKey(i)) {
                 propertyData = createPropertyData(propDef, controlParser.getValues(Constants.CONTROL_PROP_VALUE, i));
             } else {
                 propertyData = createPropertyData(propDef, null);