Changeset 44 for trunk/org.etsi.common/src/org/etsi

Timestamp:

02/16/12 19:29:33 (13 years ago)

Author:

phdmakk

Message:

+ minor fix for undefined regexes

File:

• trunk/org.etsi.common/src/org/etsi/common/MiscTools.java (modified) (1 diff)

trunk/org.etsi.common/src/org/etsi/common/MiscTools.java

@@ -173 +173 @@
 
         //TODO: cloned from NamingConventionsChecker => needs to be unified and reused
+        //note: if regExp is not set it defaults to false quietly
         public static boolean regExpMatch(String regExp, String subject) {
                 boolean matches = false;
-                Pattern pattern = Pattern.compile(regExp);
-                Matcher matcher = pattern.matcher(subject);
-//              System.out.println(regExp + " : " + subject);
-                if (matcher.matches()) {
-                        matches = true;
+                if (regExp!=null){
+                        Pattern pattern = Pattern.compile(regExp);
+                        Matcher matcher = pattern.matcher(subject);
+        //              System.out.println(regExp + " : " + subject);
+                        if (matcher.matches()) {
+                                matches = true;
+                        }
                 }
                 return matches;