Sync git svn branch with SVN repository r33324.

[simantics/platform.git] / bundles / org.simantics.diagram / src / org / simantics / diagram / connection / ModelledConnectionAdvisor.java

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/connection/ModelledConnectionAdvisor.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/connection/ModelledConnectionAdvisor.java
index 8ecf158745efb601864335cd19411e36196d03dd..16495f4cc36af5f9c153d9956b197c746f26866b 100644 (file)
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/connection/ModelledConnectionAdvisor.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/connection/ModelledConnectionAdvisor.java
@@ -127,7 +127,13 @@ public class ModelledConnectionAdvisor implements IConnectionAdvisor {
             cps.add(getConnectionPoint(graph, element2, term2, true));\r
 \r
         ConnectionJudgement judgement = modelingRules.judgeConnection(graph, cps);\r
-        if (judgement.type == ConnectionJudgementType.LEGAL)\r
+        if (judgement.type == ConnectionJudgementType.LEGAL\r
+                // #6751, Apros #12404: a connection should not be automatically\r
+                // denied just because it is not perfectly legal. Further legality\r
+                // should be decided on the client side even though the IConnectionAdvisor\r
+                // interface is not documented to return ConnectionJudgement instances,\r
+                // because the interface knows nothing about this class.\r
+                || judgement.type == ConnectionJudgementType.CANBEMADELEGAL) \r
             return judgement;\r
         return null;\r
     }\r