1 files changed, 5 insertions, 0 deletions
diff --git a/java/java-psi-api/src/com/intellij/psi/util/IsConstantExpressionVisitor.java b/java/java-psi-api/src/com/intellij/psi/util/IsConstantExpressionVisitor.java
index bbed9e3d747d..531edd732fae 100644
--- a/java/java-psi-api/src/com/intellij/psi/util/IsConstantExpressionVisitor.java
+++ b/java/java-psi-api/src/com/intellij/psi/util/IsConstantExpressionVisitor.java
@@ -87,6 +87,11 @@ public class IsConstantExpressionVisitor extends JavaElementVisitor {
     for (PsiExpression operand : expression.getOperands()) {
       operand.accept(this);
       if (!myIsConstant) return;
+      final PsiType type = operand.getType();
+      if (type != null && !(type instanceof PsiPrimitiveType) && !type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) {
+        myIsConstant = false;
+        return;
+      }
     }
   }