[Swift-commit] r3187 - trunk/src/org/griphyn/vdl/mapping/file

[noreply at svn.ci.uchicago.edu]

Author: hategan
Date: 2009-11-03 19:41:03 -0600 (Tue, 03 Nov 2009)
New Revision: 3187

Modified:
   trunk/src/org/griphyn/vdl/mapping/file/RegularExpressionMapper.java
Log:
fixed primitive check

Modified: trunk/src/org/griphyn/vdl/mapping/file/RegularExpressionMapper.java
===================================================================
--- trunk/src/org/griphyn/vdl/mapping/file/RegularExpressionMapper.java	2009-10-31 19:06:57 UTC (rev 3186)
+++ trunk/src/org/griphyn/vdl/mapping/file/RegularExpressionMapper.java	2009-11-04 01:41:03 UTC (rev 3187)
@@ -41,8 +41,10 @@
 	public PhysicalFormat map(Path path) {
 	    if (PARAM_MATCH.getRawValue(this) instanceof DSHandle) {
 	        DSHandle h = (DSHandle) PARAM_MATCH.getRawValue(this);
-	        throw new IllegalArgumentException("Non-primitive value specified for " + 
-	            PARAM_MATCH.getName() + "; maybe you meant @filename(" + h.getPathFromRoot() + ")?");
+	        if (!h.getType().isPrimitive()) {
+	            throw new IllegalArgumentException("Non-primitive value specified for " + 
+	                PARAM_MATCH.getName() + "; maybe you meant @filename(" + h.getPathFromRoot() + ")?");
+	        }
 	    }
 		String match = PARAM_MATCH.getStringValue(this);
 		String source = PARAM_SOURCE.getStringValue(this);