Author: simoneg
Date: Thu Dec 10 15:01:53 2009
New Revision: 889282
URL: http://svn.apache.org/viewvc?rev=889282&view=rev
Log:
LABS-380 : fix on null image/file values
Modified:
labs/magma/trunk/website-file/src/main/java/org/apache/magma/website/htmlpieces/MagFileHtml.java
labs/magma/trunk/website-image/src/main/java/org/apache/magma/website/htmlpieces/MagImageHtml.java
Modified:
labs/magma/trunk/website-file/src/main/java/org/apache/magma/website/htmlpieces/MagFileHtml.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-file/src/main/java/org/apache/magma/website/htmlpieces/MagFileHtml.java?rev=889282&r1=889281&r2=889282&view=diff
==============================================================================
---
labs/magma/trunk/website-file/src/main/java/org/apache/magma/website/htmlpieces/MagFileHtml.java
(original)
+++
labs/magma/trunk/website-file/src/main/java/org/apache/magma/website/htmlpieces/MagFileHtml.java
Thu Dec 10 15:01:53 2009
@@ -43,7 +43,7 @@
sb.append(output(value));
}
sb.append("<br/><input type=\"file\" name=\"" + id + "\" id=\""
+ id + "\"/>");
- if (value.getTemporaryFile() != null) {
+ if (value != null && value.getTemporaryFile() != null) {
sb.append("<input type=\"hidden\" name=\"" + id +
"_temp\" id=\"" + id + "_temp\" value=\"" +
value.getTemporaryFile().getAbsolutePath() + "\"/>");
}
return sb.toString();
Modified:
labs/magma/trunk/website-image/src/main/java/org/apache/magma/website/htmlpieces/MagImageHtml.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-image/src/main/java/org/apache/magma/website/htmlpieces/MagImageHtml.java?rev=889282&r1=889281&r2=889282&view=diff
==============================================================================
---
labs/magma/trunk/website-image/src/main/java/org/apache/magma/website/htmlpieces/MagImageHtml.java
(original)
+++
labs/magma/trunk/website-image/src/main/java/org/apache/magma/website/htmlpieces/MagImageHtml.java
Thu Dec 10 15:01:53 2009
@@ -38,7 +38,7 @@
sb.append(output(value));
}
sb.append("<br/><input type=\"file\" name=\"" + id + "\" id=\""
+ id + "\"/>");
- if (value.getTemporaryFile() != null) {
+ if (value != null && value.getTemporaryFile() != null) {
sb.append("<input type=\"hidden\" name=\"" + id +
"_temp\" id=\"" + id + "_temp\" value=\"" +
value.getTemporaryFile().getAbsolutePath() + "\"/>");
}
return sb.toString();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
