You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2002/07/04 17:48:20 UTC
cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/store FilesystemStore.java
cziegeler 2002/07/04 08:48:20
Modified: src/java/org/apache/cocoon/components/source URLSource.java
src/java/org/apache/cocoon/components/store
FilesystemStore.java
Log:
Make cocoon compilable with jdk 1.2.2
Revision Changes Path
1.20 +1 -13 xml-cocoon2/src/java/org/apache/cocoon/components/source/URLSource.java
Index: URLSource.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/URLSource.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- URLSource.java 6 Jun 2002 14:28:14 -0000 1.19
+++ URLSource.java 4 Jul 2002 15:48:20 -0000 1.20
@@ -111,9 +111,6 @@
/** The <code>SourceParameters</code> for post */
private SourceParameters postParameters;
- /** Follow Redirects ? */
- private boolean followRedirects = true;
-
/**
* Construct a new object
*/
@@ -216,9 +213,6 @@
if (this.url.getProtocol().startsWith("http") && userInfo != null) {
this.connection.setRequestProperty("Authorization","Basic "+SourceUtil.encodeBASE64(userInfo));
}
- if (this.followRedirects == false && this.connection instanceof HttpURLConnection) {
- ((HttpURLConnection)connection).setInstanceFollowRedirects(false);
- }
// do a post operation
if (this.connection instanceof HttpURLConnection
&& this.postParameters != null) {
@@ -340,10 +334,4 @@
this.postParameters = pars;
}
- /**
- * Set the follow redirects flag
- */
- public void setFollowRedirects(boolean flag) {
- this.followRedirects = flag;
- }
}
1.16 +6 -2 xml-cocoon2/src/java/org/apache/cocoon/components/store/FilesystemStore.java
Index: FilesystemStore.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/store/FilesystemStore.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- FilesystemStore.java 6 May 2002 12:28:50 -0000 1.15
+++ FilesystemStore.java 4 Jul 2002 15:48:20 -0000 1.16
@@ -376,7 +376,11 @@
*/
protected String decode( String filename )
{
- return java.net.URLDecoder.decode( filename );
+ try {
+ return java.net.URLDecoder.decode( filename );
+ } catch (Exception local) {
+ throw new RuntimeException("Exception in decode: " + local);
+ }
}
/** A BitSet defining the characters which don't need encoding */
----------------------------------------------------------------------
In case of troubles, e-mail: webmaster@xml.apache.org
To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org