# HG changeset patch # User robcast # Date 1298997526 -3600 # Node ID 70790d843520087b6b1f77a0cd2cec97f05b2c03 # Parent dd78b1f5f467b4c578703ea85732234a8b088410 fixed NPE in ImageInfoDocuImage.identify() diff -r dd78b1f5f467 -r 70790d843520 servlet/src/digilib/image/ImageInfoDocuImage.java --- a/servlet/src/digilib/image/ImageInfoDocuImage.java Tue Mar 01 15:17:51 2011 +0100 +++ b/servlet/src/digilib/image/ImageInfoDocuImage.java Tue Mar 01 17:38:46 2011 +0100 @@ -43,13 +43,15 @@ logger.debug("image size: " + ii.getSize()); return ii; } - return null; + } catch (Exception e) { + logger.debug("ImageInfoDocuimage unable to identify.", e); } finally { // close file, don't close stream(?) if (raf != null) { raf.close(); } } + return null; } diff -r dd78b1f5f467 -r 70790d843520 servlet/src/digilib/servlet/Scaler.java --- a/servlet/src/digilib/servlet/Scaler.java Tue Mar 01 15:17:51 2011 +0100 +++ b/servlet/src/digilib/servlet/Scaler.java Tue Mar 01 17:38:46 2011 +0100 @@ -31,7 +31,7 @@ private static final long serialVersionUID = 5289386646192471549L; /** digilib servlet version (for all components) */ - public static final String version = "1.9.1a14"; + public static final String version = "1.9.1a15"; /** servlet error codes */ public static enum Error {UNKNOWN, AUTH, FILE, IMAGE};