[381410] IllegalStateException from OCL query with non-Collection result

https://bugs.eclipse.org/bugs/show_bug.cgi?id=381410

1 files changed, 14 insertions, 14 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/OCLQueryHandler.java b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/OCLQueryHandler.java
index 93bf2fc678..03eb11f66c 100644
--- a/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/OCLQueryHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.ocl/src/org/eclipse/emf/cdo/server/ocl/OCLQueryHandler.java
@@ -158,7 +158,20 @@ public class OCLQueryHandler implements IQueryHandler
       }
 
       Object result = evaluate(query, object);
-      addResult(result, context, view);
+      if (result instanceof Collection<?>)
+      {
+        for (Object element : (Collection<?>)result)
+        {
+          if (!addResult(element, context, view))
+          {
+            break;
+          }
+        }
+      }
+      else
+      {
+        addResult(result, context, view);
+      }
     }
     catch (Exception ex)
     {
@@ -181,19 +194,6 @@ public class OCLQueryHandler implements IQueryHandler
       return context.addResult(revision);
     }
 
-    if (result instanceof Collection<?>)
-    {
-      for (Object element : (Collection<?>)result)
-      {
-        if (!addResult(element, context, view))
-        {
-          return false;
-        }
-      }
-
-      return true;
-    }
-
     return context.addResult(result);
   }