You are viewing a plain text version of this content. The canonical link for it is here.
Posted to photark-commits@incubator.apache.org by lr...@apache.org on 2010/03/15 06:48:39 UTC

svn commit: r923082 - in /incubator/photark/trunk: photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageUploadServiceImpl.java photark-webapp/src/main/webapp/WEB-INF/web.composite

Author: lresende
Date: Mon Mar 15 06:48:39 2010
New Revision: 923082

URL: http://svn.apache.org/viewvc?rev=923082&view=rev
Log:
Fixing 'IllegalArgumentException: Mark is not supported' when testing if uploaded file is archive or not

Modified:
    incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageUploadServiceImpl.java
    incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite

Modified: incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageUploadServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageUploadServiceImpl.java?rev=923082&r1=923081&r2=923082&view=diff
==============================================================================
--- incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageUploadServiceImpl.java (original)
+++ incubator/photark/trunk/photark-jcr/src/main/java/org/apache/photark/jcr/services/JCRImageUploadServiceImpl.java Mon Mar 15 06:48:39 2010
@@ -19,6 +19,7 @@
 
 package org.apache.photark.jcr.services;
 
+import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -126,7 +127,7 @@ public class JCRImageUploadServiceImpl e
                         logger.log(Level.INFO, "fileName:"+fileName);
                     }
 
-                    InputStream inStream = fileItem.getInputStream();
+                    InputStream inStream = new BufferedInputStream(fileItem.getInputStream());
                     List<Image> pictures = new ArrayList<Image>();
 
                     if (isArchive(inStream)) {

Modified: incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite?rev=923082&r1=923081&r2=923082&view=diff
==============================================================================
--- incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite (original)
+++ incubator/photark/trunk/photark-webapp/src/main/webapp/WEB-INF/web.composite Mon Mar 15 06:48:39 2010
@@ -43,7 +43,7 @@
     <!-- Component responsible for providing upload support for gallery/album -->
     <component name="ImageUploadServiceComponent">
 		<implementation.java class="org.apache.photark.jcr.services.JCRImageUploadServiceImpl"/>
-		<service name="ImageUploadService">
+		<service name="Servlet">
 			<tuscany:binding.http uri="/admin/upload"/>
 		</service>    	  	
 	</component>