[aperture-commit] SF.net SVN: aperture:[2466] aperture/trunk/core/src/main/java/org/ semanticdesktop/aperture/extractor/jpg/JpgHeaderExtractor.java

[<my...@us...>]

Revision: 2466
          http://aperture.svn.sourceforge.net/aperture/?rev=2466&view=rev
Author:   mylka
Date:     2011-03-14 16:13:47 +0000 (Mon, 14 Mar 2011)

Log Message:
-----------
added a little check to the jpg header extractor which prevents spurious warnings in the logs on jpgs with missing metadata

Modified Paths:
--------------
    aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/extractor/jpg/JpgHeaderExtractor.java

Modified: aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/extractor/jpg/JpgHeaderExtractor.java
===================================================================
--- aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/extractor/jpg/JpgHeaderExtractor.java	2011-03-04 10:41:48 UTC (rev 2465)
+++ aperture/trunk/core/src/main/java/org/semanticdesktop/aperture/extractor/jpg/JpgHeaderExtractor.java	2011-03-14 16:13:47 UTC (rev 2466)
@@ -140,17 +140,21 @@
      * @param property the property to use
      */
     private void addStringMetadataIfSet(int tag, URI property, Directory directory) {
+    	if (directory.containsTag(tag)) {
         String entry = directory.getString(tag);
         if (entry != null)
             result.add(property, entry);
+    	}
     }
     
     private void addDateMetadataIfSet(int tag, URI property, Directory directory) {
         Date date;
 	try {
+		if (directory.containsTag(tag)) {
 	    date = directory.getDate(tag);
 	     if (date != null)
 	            result.add(property, date);
+		}
 	} catch (MetadataException e) {
 	    LoggerFactory.getLogger(getClass()).warn("Wrong date metadata",e);
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.