svn commit: r598130 - /mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionFinder.java

[tr...@apache.org]

Author: trustin
Date: Sun Nov 25 21:19:14 2007
New Revision: 598130

URL: http://svn.apache.org/viewvc?rev=598130&view=rev
Log:
Improved IoSessionFinder's constructor to detect empty string and throw IllegalArgumentException instead of OgnlException

Modified:
    mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionFinder.java

Modified: mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionFinder.java
URL: http://svn.apache.org/viewvc/mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionFinder.java?rev=598130&r1=598129&r2=598130&view=diff
==============================================================================
--- mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionFinder.java (original)
+++ mina/trunk/integration-ognl/src/main/java/org/apache/mina/integration/ognl/IoSessionFinder.java Sun Nov 25 21:19:14 2007
@@ -34,12 +34,21 @@
 public class IoSessionFinder {
     private final Object expression;
     
-    public IoSessionFinder(String query) throws OgnlException {
+    public IoSessionFinder(String query) {
         if (query == null) {
             throw new NullPointerException("query");
         }
         
-        expression = Ognl.parseExpression(query);
+        query = query.trim();
+        if (query.length() == 0) {
+            throw new IllegalArgumentException("query is empty.");
+        }
+        
+        try {
+            expression = Ognl.parseExpression(query);
+        } catch (OgnlException e) {
+            throw new IllegalArgumentException("query: " + query);
+        }
     }
     
     public Set<IoSession> find(Iterable<IoSession> sessions) throws OgnlException {