Merge pull request #15 from Qnerd/master

SubMatches are added on every call
arimus · Nov 14, 2013 · 646d824 · 646d824
2 parents 7c0d1b1 + bd5672a
commit 646d824
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 5 deletions.
diff --git a/src/main/java/net/sf/jmimemagic/MagicMatch.java b/src/main/java/net/sf/jmimemagic/MagicMatch.java
@@ -400,9 +400,11 @@ protected Object clone()
         clone.setOffset(offset);
 
         // these properties should only be String types, so we shouldn't have to clone them
-        HashMap m = new HashMap();
-        m.putAll(properties);
-        clone.setProperties(m);
+        if(properties!= null) {
+	        HashMap m = new HashMap();
+	        m.putAll(properties);
+	        clone.setProperties(m);
+        }
 
         Iterator i = subMatches.iterator();
         ArrayList a = new ArrayList();

diff --git a/src/main/java/net/sf/jmimemagic/MagicMatcher.java b/src/main/java/net/sf/jmimemagic/MagicMatcher.java
@@ -239,7 +239,12 @@ public MagicMatch test(File f, boolean onlyMimeMatch)
 
             if (testInternal(buf)) {
                 // set the top level match to this one
-                match = getMatch();
+                try {
+                    match = getMatch() != null ? (MagicMatch) getMatch()
+                            .clone() : null;
+                } catch (CloneNotSupportedException e) {
+                    // noop
+                }
 
                 log.debug("test(File): testing matched '" + description + "'");
 
@@ -343,7 +348,12 @@ public MagicMatch test(byte[] data, boolean onlyMimeMatch)
 
             if (testInternal(buf)) {
                 // set the top level match to this one
-                match = getMatch();
+                try {
+                    match = getMatch() != null ? (MagicMatch) getMatch()
+                            .clone() : null;
+                } catch (CloneNotSupportedException e) {
+                    // noop
+                }
 
                 log.debug("test(byte[]): testing matched '" + description + "'");
 

diff --git a/src/test/java/net/sf/jmimemagic/MagicTest.java b/src/test/java/net/sf/jmimemagic/MagicTest.java
@@ -375,4 +375,23 @@ public void testZip(){
 		}
 
 	}
+
+    public void testSubMatches(){
+        System.out.print("\ntesting Submatches...");
+        try {
+            MagicMatch match = Magic.getMagicMatch(new File(gifFile), true, false);
+            Assert.assertEquals(3, match.getSubMatches().size());
+            match = Magic.getMagicMatch(new File(gifFile), true, false);
+            Assert.assertEquals(3, match.getSubMatches().size());           
+            System.out.print("ok");
+        } catch (Exception e) {
+            e.printStackTrace();
+            fail("exception in testSubMatches(). message: " + e);
+        } catch (Error e) {
+            e.printStackTrace();
+            fail("error in testSubMatches(). message: " + e.getMessage());
+        }
+
+    }
+
 }