summaryrefslogtreecommitdiffstats
path: root/libjava/java/net/URL.java
diff options
context:
space:
mode:
authormkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>2004-05-03 20:23:28 +0000
committermkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4>2004-05-03 20:23:28 +0000
commit2c2342e46e618ab924cef7fcf7e27ce8c85d36c6 (patch)
tree7c1ecb4129cfeaf7c93bf2bb9347e0cb39665802 /libjava/java/net/URL.java
parent120c46c2553aedac243cc1187c7846a4bee93da1 (diff)
downloadppe42-gcc-2c2342e46e618ab924cef7fcf7e27ce8c85d36c6.tar.gz
ppe42-gcc-2c2342e46e618ab924cef7fcf7e27ce8c85d36c6.zip
2004-05-03 Mark Wielaard <mark@klomp.org>
* gnu/java/security/der/DERReader.java: Call static methods staticly. * java/awt/TextComponent.java (select): Use selectionEnd parameter. * java/net/URL.java (set(String, String, int, String, String, String, String, String)): Assign this.file to path or path + "?" + query. * java/util/Arrays.java: Call static methods staticly. * java/util/zip/ZipEntry.java: Likewise. * javax/swing/plaf/basic/BasicArrowButton.java (setDirection): Assign dir to this.direction. * javax/swing/table/DefaultTableCellRenderer.java (noFocusBorder): Assign static field only once. (DefaultTableCellRenderer): Don't reassign noFocusBorder each time. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81453 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/net/URL.java')
-rw-r--r--libjava/java/net/URL.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/libjava/java/net/URL.java b/libjava/java/net/URL.java
index 729d96fa878..623f6601770 100644
--- a/libjava/java/net/URL.java
+++ b/libjava/java/net/URL.java
@@ -743,12 +743,11 @@ public final class URL implements Serializable
this.host = host;
this.userInfo = userInfo;
this.port = port;
- this.file = path;
this.authority = authority;
if (query == null)
- this.file = file;
+ this.file = path;
else
- this.file = file + "?" + query;
+ this.file = path + "?" + query;
this.ref = ref;
hashCode = hashCode(); // Used for serialization.
}
OpenPOWER on IntegriCloud