Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkhussey2006-02-09 15:47:14 +0000
committerkhussey2006-02-09 15:47:14 +0000
commitacee7211b5729a03f89b9a34230087414d4e097c (patch)
tree591c87d4fc1c222793783a8642ef5cc65f022a4a
parent21f018f582a92d9fb1406b5c45a3566a491eda3c (diff)
downloadorg.eclipse.uml2.test-acee7211b5729a03f89b9a34230087414d4e097c.tar.gz
org.eclipse.uml2.test-acee7211b5729a03f89b9a34230087414d4e097c.tar.xz
org.eclipse.uml2.test-acee7211b5729a03f89b9a34230087414d4e097c.zip
[127082] Avoiding NPE in Property#setOpposite(Property).
-rw-r--r--plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PropertyOperations.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PropertyOperations.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PropertyOperations.java
index 9fad77dd..d7d1e7bd 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PropertyOperations.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/internal/operations/PropertyOperations.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - initial API and implementation
*
- * $Id: PropertyOperations.java,v 1.21 2006/01/27 04:55:56 khussey Exp $
+ * $Id: PropertyOperations.java,v 1.22 2006/02/09 15:47:14 khussey Exp $
*/
package org.eclipse.uml2.uml.internal.operations;
@@ -634,7 +634,7 @@ public class PropertyOperations
throw new IllegalStateException();
}
- if (newOpposite.getOwningAssociation() != null) {
+ if (newOpposite != null && newOpposite.getOwningAssociation() != null) {
throw new IllegalArgumentException(String.valueOf(newOpposite));
}

Back to the top