[Swift-commit] r7896 - branches/release-0.95/src/org/griphyn/vdl/mapping/file

hategan at ci.uchicago.edu hategan at ci.uchicago.edu
Mon Jun 2 00:16:38 CDT 2014


Author: hategan
Date: 2014-06-02 00:16:38 -0500 (Mon, 02 Jun 2014)
New Revision: 7896

Modified:
   branches/release-0.95/src/org/griphyn/vdl/mapping/file/StructuredRegularExpressionMapper.java
Log:
fixed broken merge

Modified: branches/release-0.95/src/org/griphyn/vdl/mapping/file/StructuredRegularExpressionMapper.java
===================================================================
--- branches/release-0.95/src/org/griphyn/vdl/mapping/file/StructuredRegularExpressionMapper.java	2014-06-02 04:36:36 UTC (rev 7895)
+++ branches/release-0.95/src/org/griphyn/vdl/mapping/file/StructuredRegularExpressionMapper.java	2014-06-02 05:16:38 UTC (rev 7896)
@@ -70,7 +70,7 @@
 		Collection<Path> output = new ArrayList<Path>();
 		Collection<DSHandle> sourceFields;
 		try {
-			sourceFields = sourceHandle.getAllFields();
+			sourceFields = sourceHandle.getFields(Path.CHILDREN); 
 		}
 		catch (InvalidPathException ipe) {
 			return Collections.emptyList();




More information about the Swift-commit mailing list