svn commit: r1536927 - /ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/AssociationHelper.java

[marrs]

Author: marrs
Date: Tue Oct 29 23:23:33 2013
New Revision: 1536927

URL: http://svn.apache.org/r1536927
Log:
Fixed a NPE when dropping a feature onto a bundle name. It now does nothing. We 
might want to think about ACE-319 in this context.

Modified:
    
ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/AssociationHelper.java

Modified: 
ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/AssociationHelper.java
URL: 
http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/AssociationHelper.java?rev=1536927&r1=1536926&r2=1536927&view=diff
==============================================================================
--- 
ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/AssociationHelper.java
 (original)
+++ 
ace/trunk/org.apache.ace.webui.vaadin/src/org/apache/ace/webui/vaadin/component/AssociationHelper.java
 Tue Oct 29 23:23:33 2013
@@ -108,7 +108,13 @@ public class AssociationHelper {
             }
 
             private boolean equals(Object itemId, RepositoryObject object) {
-                return object.getDefinition().equals(itemId);
+                if (object == null) {
+                    return false;
+                }
+                else {
+                    String definition = object.getDefinition();
+                    return definition == null ? false : 
definition.equals(itemId);
+                }
             }
         };
     }