svn commit: [jahia] r18551 - /branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/utils/JahiaTools.java

[tdraier]

Author: tdraier
Date: Tue Sep 18 16:40:09 2007
New Revision: 18551

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18551&repname=
=3Djahia
Log:
fixed local jahia request when stream is smaller than 10Mb ( JAHIA-2296 )

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/utils/JahiaTools.j=
ava

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/utils/JahiaT=
ools.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/utils/JahiaTools.java&rev=3D18551&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/utils/JahiaTools.j=
ava (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/utils/JahiaTools.j=
ava Tue Sep 18 16:40:09 2007
@@ -1336,6 +1336,10 @@
                 FileCleaner.track(dfos.getFile(), inputStream);
                 IOUtils.copy(method.getResponseBodyAsStream(), dfos);
                 method.releaseConnection();
+                if(dfos.isInMemory()){
+                    inputStream.close();
+                    return new ByteArrayInputStream(dfos.getData());
+                }
                 return inputStream;
             }
         }

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list