svn commit: r420592 - /incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/PatternMatchNode.java

[aadamchik]

Author: aadamchik
Date: Mon Jul 10 10:42:31 2006
New Revision: 420592

URL: http://svn.apache.org/viewvc?rev=420592&view=rev
Log:
CAY-567 - take two

Modified:
    
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/PatternMatchNode.java

Modified: 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/PatternMatchNode.java
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/PatternMatchNode.java?rev=420592&r1=420591&r2=420592&view=diff
==============================================================================
--- 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/PatternMatchNode.java
 (original)
+++ 
incubator/cayenne/main/trunk/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/exp/parser/PatternMatchNode.java
 Mon Jul 10 10:42:31 2006
@@ -89,24 +89,27 @@
 
                 if (!patternCompiled) {
                     pattern = null;
-                    patternCompiled = true;
 
                     if (jjtGetNumChildren() < 2) {
+                        patternCompiled = true;
                         return null;
                     }
 
                     // precompile pattern
                     ASTScalar patternNode = (ASTScalar) jjtGetChild(1);
                     if (patternNode == null) {
+                        patternCompiled = true;
                         return null;
                     }
 
                     String srcPattern = (String) patternNode.getValue();
                     if (srcPattern == null) {
+                        patternCompiled = true;
                         return null;
                     }
 
                     pattern = Util.sqlPatternToPattern(srcPattern, 
ignoringCase);
+                    patternCompiled = true;
                 }
             }
         }