Author: fanningpj
Date: Thu Apr 10 13:47:33 2025
New Revision: 1924992
URL: http://svn.apache.org/viewvc?rev=1924992&view=rev
Log:
[bug-69628] more changes to getMax methods
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampSimpleHttpClient.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampSimpleHttpClient.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampSimpleHttpClient.java?rev=1924992&r1=1924991&r2=1924992&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampSimpleHttpClient.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/services/TimeStampSimpleHttpClient.java
Thu Apr 10 13:47:33 2025
@@ -72,7 +72,8 @@ public class TimeStampSimpleHttpClient i
* @return the max timestamp response size allowed
*/
public static int getMaxTimestampResponseSize() {
- return MAX_TIMESTAMP_RESPONSE_SIZE;
+ final int ioMaxSize = IOUtils.getByteArrayMaxOverride();
+ return ioMaxSize < 0 ? MAX_TIMESTAMP_RESPONSE_SIZE :
Math.min(MAX_TIMESTAMP_RESPONSE_SIZE, ioMaxSize);
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java?rev=1924992&r1=1924991&r2=1924992&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
Thu Apr 10 13:47:33 2025
@@ -58,7 +58,8 @@ public final class XSLFPictureData exten
* @return the max image size allowed for XSLF pictures
*/
public static int getMaxImageSize() {
- return MAX_IMAGE_SIZE;
+ final int ioMaxSize = IOUtils.getByteArrayMaxOverride();
+ return ioMaxSize < 0 ? MAX_IMAGE_SIZE : Math.min(MAX_IMAGE_SIZE,
ioMaxSize);
}
private Long checksum;
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java?rev=1924992&r1=1924991&r2=1924992&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xwpf/usermodel/XWPFPictureData.java
Thu Apr 10 13:47:33 2025
@@ -49,7 +49,8 @@ public class XWPFPictureData extends POI
* @return the max image size allowed for XSSF pictures
*/
public static int getMaxImageSize() {
- return MAX_IMAGE_SIZE;
+ final int ioMaxSize = IOUtils.getByteArrayMaxOverride();
+ return ioMaxSize < 0 ? MAX_IMAGE_SIZE : Math.min(MAX_IMAGE_SIZE,
ioMaxSize);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
