svn commit: r1294606 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/Expression.java

[aadamchik]

Author: aadamchik
Date: Tue Feb 28 12:10:12 2012
New Revision: 1294606

URL: http://svn.apache.org/viewvc?rev=1294606&view=rev
Log:
handling nulls in Exception messages

Modified:
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/Expression.java

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/Expression.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/Expression.java?rev=1294606&r1=1294605&r2=1294606&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/Expression.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/exp/Expression.java
 Tue Feb 28 12:10:12 2012
@@ -150,11 +150,17 @@ public abstract class Expression impleme
             return parser.expression();
         }
         catch (ParseException ex) {
-            throw new ExpressionException(ex.getMessage(), ex);
+
+            // can be null
+            String message = ex.getMessage();
+            throw new ExpressionException(message != null ? message : "", ex);
         }
         catch (Throwable th) {
+            // can be null
+            String message = th.getMessage();
+            
             // another common error is TokenManagerError
-            throw new ExpressionException(th.getMessage(), th);
+            throw new ExpressionException(message != null ? message : "", th);
         }
     }