[210580] cdamus - NPE in AbstractVisitor on Invariant Constraints
Ported back from HEAD branch (1.2)
diff --git a/plugins/org.eclipse.ocl/META-INF/MANIFEST.MF b/plugins/org.eclipse.ocl/META-INF/MANIFEST.MF
index b316c79..e83c499 100644
--- a/plugins/org.eclipse.ocl/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.ocl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.ocl;singleton:=true
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/AbstractVisitor.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/AbstractVisitor.java
index 0878cc4..a07bf91 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/AbstractVisitor.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/utilities/AbstractVisitor.java
@@ -12,7 +12,7 @@
*
* </copyright>
*
- * $Id: AbstractVisitor.java,v 1.3 2007/05/17 17:06:22 cdamus Exp $
+ * $Id: AbstractVisitor.java,v 1.3.2.1 2007/11/26 22:09:44 cdamus Exp $
*/
package org.eclipse.ocl.utilities;
@@ -686,7 +686,9 @@
*/
public T visitExpressionInOCL(ExpressionInOCL<C, PM> expression) {
T contextResult = expression.getContextVariable().accept(this);
- T resultResult = expression.getResultVariable().accept(this);
+
+ Variable<C, PM> resultVar = expression.getResultVariable();
+ T resultResult = (resultVar == null)? null : resultVar.accept(this);
List<T> parameterResults;
List<Variable<C, PM>> parameters = expression.getParameterVariable();
