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

Posted to commits@cayenne.apache.org by ol...@apache.org on 2009/12/14 17:01:40 UTC

svn commit: r890387 - /cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java

Author: oltka
Date: Mon Dec 14 16:01:39 2009
New Revision: 890387

URL: http://svn.apache.org/viewvc?rev=890387&view=rev
Log:
CAY-1335

* fix:if delete text in field inheritance then press "Enter" - we have NullPointerExcetion

(cherry picked from commit 1c9c5b92e29d9e490ffa8bb0c9bd30cec6523f6e)

Modified:
    cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java

Modified: cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java?rev=890387&r1=890386&r2=890387&view=diff
==============================================================================
--- cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java (original)
+++ cayenne/main/branches/STABLE-3.0/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityTab.java Mon Dec 14 16:01:39 2009
@@ -261,7 +261,7 @@
                 // Change super-entity
                 CayenneMapEntry superEntity = (CayenneMapEntry) superEntityCombo
                         .getSelectedItem();
-                String name = (superEntity == noInheritance) ? null : superEntity
+                String name = (superEntity==null || superEntity == noInheritance) ? null : superEntity
                         .getName();
 
                 ObjEntity entity = mediator.getCurrentObjEntity();