From 679a16f022626dcb2e4bc6db31d03a97ee747315 Mon Sep 17 00:00:00 2001 From: Sergey Vladimirov Date: Sat, 22 Oct 2011 02:00:34 +0000 Subject: [PATCH] replace exception with warning git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1187636 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/poi/hpsf/TypedPropertyValue.java | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/src/java/org/apache/poi/hpsf/TypedPropertyValue.java b/src/java/org/apache/poi/hpsf/TypedPropertyValue.java index b421fcd484..455aef6bd4 100644 --- a/src/java/org/apache/poi/hpsf/TypedPropertyValue.java +++ b/src/java/org/apache/poi/hpsf/TypedPropertyValue.java @@ -1,12 +1,16 @@ package org.apache.poi.hpsf; -import org.apache.poi.util.LittleEndian; - import org.apache.poi.util.Internal; +import org.apache.poi.util.LittleEndian; +import org.apache.poi.util.POILogFactory; +import org.apache.poi.util.POILogger; @Internal class TypedPropertyValue { + private static final POILogger logger = POILogFactory + .getLogger( TypedPropertyValue.class ); + private int _type; private Object _value; @@ -26,6 +30,11 @@ class TypedPropertyValue _value = value; } + Object getValue() + { + return _value; + } + int read( byte[] data, int startOffset ) { int offset = startOffset; @@ -34,11 +43,13 @@ class TypedPropertyValue offset += LittleEndian.SHORT_SIZE; short padding = LittleEndian.getShort( data, offset ); - if ( padding != 0 ) - throw new IllegalPropertySetDataException( - "Property padding at offset " + offset - + " MUST be 0, but it's value is " + padding ); offset += LittleEndian.SHORT_SIZE; + if ( padding != 0 ) + { + logger.log( POILogger.WARN, "TypedPropertyValue padding at offset " + + offset + " MUST be 0, but it's value is " + padding ); + } + offset += readValuePadded( data, offset ); return offset - startOffset; -- 2.39.5