[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Oliver Kellogg]

SVN commit 507228 by okellogg:

apply commit 507222 from branches/KDE/3.5

 M  +1 -9      umlobject.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/umlobject.cpp #507227:507228
@@ -398,19 +398,11 @@
 }
 
 bool UMLObject::resolveRef() {
-    if (m_pSecondary) {
+    if (m_pSecondary || (m_SecondaryId.isEmpty() && m_SecondaryFallback.isEmpty())) {
         maybeSignalObjectCreated();
         return true;
     }
-    if (m_SecondaryId.isEmpty() && m_SecondaryFallback.isEmpty()) {
 #ifdef VERBOSE_DEBUGGING
-        kDebug() << "UMLObject::resolveRef(" << m_Name
-                  << "): neither m_SecondaryId nor m_SecondaryFallback is set"
-                  << endl;
-#endif
-        return true;
-    }
-#ifdef VERBOSE_DEBUGGING
     kDebug() << "UMLObject::resolveRef(" << m_Name << "): m_SecondaryId is "
               << m_SecondaryId << endl;
 #endif