Author: berlog
Date: Tue Aug 14 21:11:53 2012
New Revision: 1373110
URL: http://svn.apache.org/viewvc?rev=1373110&view=rev
Log:
fixed bug 53432
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java?rev=1373110&r1=1373109&r2=1373110&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
(original)
+++
poi/trunk/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
Tue Aug 14 21:11:53 2012
@@ -257,7 +257,9 @@ public abstract class AbstractEscherHold
*/
public void decode()
{
- byte[] rawData = getRawData();
- convertToEscherRecords(0, rawData.length, rawData );
+ if (null == escherRecords || 0 == escherRecords.size()){
+ byte[] rawData = getRawData();
+ convertToEscherRecords(0, rawData.length, rawData );
+ }
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java?rev=1373110&r1=1373109&r2=1373110&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java Tue Aug
14 21:11:53 2012
@@ -2268,4 +2268,19 @@ if(1==2) {
HSSFSheet sh2 = wb.cloneSheet(0);
assertNotNull(sh2.getDrawingPatriarch());
}
+
+ public void test53432(){
+ Workbook wb = new HSSFWorkbook(); //or new HSSFWorkbook();
+ wb.addPicture(new byte[]{123,22}, Workbook.PICTURE_TYPE_JPEG);
+ assertEquals(wb.getAllPictures().size(), 1);
+
+ wb = new HSSFWorkbook();
+ wb = writeOutAndReadBack((HSSFWorkbook) wb);
+ assertEquals(wb.getAllPictures().size(), 0);
+ wb.addPicture(new byte[]{123,22}, Workbook.PICTURE_TYPE_JPEG);
+ assertEquals(wb.getAllPictures().size(), 1);
+
+ wb = writeOutAndReadBack((HSSFWorkbook) wb);
+ assertEquals(wb.getAllPictures().size(), 1);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
