You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/01/20 10:33:13 UTC
svn commit: r1061176 - in /wicket/trunk:
wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/
wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/
wicket-util/src/main/java/org/apache/wicket/util/upload/
Author: mgrigorov
Date: Thu Jan 20 09:33:12 2011
New Revision: 1061176
URL: http://svn.apache.org/viewvc?rev=1061176&view=rev
Log:
Fortify devutils - WicketObjects.sizeOf() may return -1 in case of Exception while calculating the size during serialization.
Make IFileUploadCleaner member in DiskFileItem transient - it is needed just for the request lifetime to add the item in the tracker. No need it after that
Modified:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionTotalSizeModel.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java
Modified: wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java?rev=1061176&r1=1061175&r2=1061176&view=diff
==============================================================================
--- wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java (original)
+++ wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/SessionSizeDebugPanel.java Thu Jan 20 09:33:12 2011
@@ -72,7 +72,13 @@ public class SessionSizeDebugPanel exten
@Override
public String getObject() {
- return size.getObject() + " / " + totalSize.getObject();
+ Bytes sessionSizeInBytes = size.getObject();
+ String sessionSizeAsString = sessionSizeInBytes != null ? sessionSizeInBytes.toString() : "unknown";
+
+ Bytes totalSizeInBytes = totalSize.getObject();
+ String totalSizeAsString = totalSizeInBytes != null ? totalSizeInBytes.toString() : "unknown";
+
+ return sessionSizeAsString + " / " + totalSizeAsString;
}
@Override
Modified: wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java?rev=1061176&r1=1061175&r2=1061176&view=diff
==============================================================================
--- wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java (original)
+++ wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionSizeModel.java Thu Jan 20 09:33:12 2011
@@ -33,7 +33,8 @@ public class SessionSizeModel extends Lo
@Override
protected Bytes load() {
- return Bytes.bytes(WicketObjects.sizeof(session));
+ long sizeOfSession = WicketObjects.sizeof(session);
+ return sizeOfSession > -1 ? Bytes.bytes(sizeOfSession) : null;
}
@Override
Modified: wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionTotalSizeModel.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionTotalSizeModel.java?rev=1061176&r1=1061175&r2=1061176&view=diff
==============================================================================
--- wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionTotalSizeModel.java (original)
+++ wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/SessionTotalSizeModel.java Thu Jan 20 09:33:12 2011
@@ -32,7 +32,8 @@ public class SessionTotalSizeModel exten
@Override
protected Bytes load() {
- return Bytes.bytes(session.getSizeInBytes());
+ long sizeInBytes = session.getSizeInBytes();
+ return sizeInBytes > -1 ? Bytes.bytes(sizeInBytes) : null;
}
@Override
Modified: wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java?rev=1061176&r1=1061175&r2=1061176&view=diff
==============================================================================
--- wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java (original)
+++ wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/upload/DiskFileItem.java Thu Jan 20 09:33:12 2011
@@ -172,7 +172,11 @@ public class DiskFileItem implements Fil
*/
private FileItemHeaders headers;
- private final IFileUploadCleaner fileUploadCleaner;
+ /**
+ * This is transient because it is needed only for the upload request lifetime to add this file
+ * item in the tracker. After that the cleaner is not needed anymore.
+ */
+ private transient final IFileUploadCleaner fileUploadCleaner;
// ----------------------------------------------------------- Constructors