svn commit: r412746 - /incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/action/ObjEntitySyncAction.java

[aadamchik]

Author: aadamchik
Date: Thu Jun  8 06:19:51 2006
New Revision: 412746

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

Modified:
    
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/action/ObjEntitySyncAction.java

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/action/ObjEntitySyncAction.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/action/ObjEntitySyncAction.java?rev=412746&r1=412745&r2=412746&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/action/ObjEntitySyncAction.java
 (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/modeler/java/org/objectstyle/cayenne/modeler/action/ObjEntitySyncAction.java
 Thu Jun  8 06:19:51 2006
@@ -109,7 +109,7 @@
         ProjectController mediator = getProjectController();
         ObjEntity entity = mediator.getCurrentObjEntity();
 
-        if (entity != null) {
+        if (entity != null && entity.getDbEntity() != null) {
             EntityMergeSupport merger = new EntitySyncController(Application
                     .getInstance()
                     .getFrameController(), entity).createMerger();