diff options
| author | Brent Eagles <brent@zeroc.com> | 2005-07-04 17:33:54 +0000 |
|---|---|---|
| committer | Brent Eagles <brent@zeroc.com> | 2005-07-04 17:33:54 +0000 |
| commit | 2e068827f30788cf87acc3058cbfc46f5622a10b (patch) | |
| tree | 56b1fe26477c23be86430b9817513389b8eee2ce | |
| parent | Cleaned up some ICEE stuff. (diff) | |
| download | ice-2e068827f30788cf87acc3058cbfc46f5622a10b.tar.bz2 ice-2e068827f30788cf87acc3058cbfc46f5622a10b.tar.xz ice-2e068827f30788cf87acc3058cbfc46f5622a10b.zip | |
fix up some j2se compilation issues
| -rw-r--r-- | javae/build.xml | 2 | ||||
| -rw-r--r-- | javae/config/build.properties | 2 | ||||
| -rw-r--r-- | javae/jdk/Ice/PropertiesI.java | 2 | ||||
| -rw-r--r-- | javae/jdk/IceInternal/Network.java | 14 |
4 files changed, 14 insertions, 6 deletions
diff --git a/javae/build.xml b/javae/build.xml index 5f47f7945a0..e1adb00c866 100644 --- a/javae/build.xml +++ b/javae/build.xml @@ -58,7 +58,7 @@ <depend srcdir="${generated.dir}:${src.dir}:${target-profile}" destdir="${lib.dir}" cache="${cache.dir}"/> <javac srcdir="${generated.dir}:${src.dir}:${target-profile}" destdir="${lib.dir}" debug="${debug}" optimize="${optimize}" deprecation="on" source="1.3" target="1.3"> - <bootclasspath refid="bootclasspath"/> +<!-- <bootclasspath refid="bootclasspath"/> --> </javac> </target> diff --git a/javae/config/build.properties b/javae/config/build.properties index 806631150ca..ad23c1578a9 100644 --- a/javae/config/build.properties +++ b/javae/config/build.properties @@ -22,4 +22,4 @@ debug = on # # Can be one of midp or j2se # -target-profile = midp +target-profile = j2se diff --git a/javae/jdk/Ice/PropertiesI.java b/javae/jdk/Ice/PropertiesI.java index 731b7bb8255..5b6da87ce44 100644 --- a/javae/jdk/Ice/PropertiesI.java +++ b/javae/jdk/Ice/PropertiesI.java @@ -215,7 +215,7 @@ public final class PropertiesI extends LocalObjectImpl implements Properties { String pattern = IceInternal.PropertyNames.validProps[i][0]; dotPos = pattern.indexOf('.'); - assert(dotPos != -1); + IceUtil.Debug.Assert(dotPos != -1); String propPrefix = pattern.substring(1, dotPos - 1); if(!propPrefix.equals(prefix)) { diff --git a/javae/jdk/IceInternal/Network.java b/javae/jdk/IceInternal/Network.java index 88092f74169..2e32eb28354 100644 --- a/javae/jdk/IceInternal/Network.java +++ b/javae/jdk/IceInternal/Network.java @@ -122,9 +122,17 @@ public final class Network public static String getLocalHost(boolean numeric) { - java.net.InetAddress addr = getLocalAddress(); - - return numeric ? addr.getHostAddress() : addr.getHostName(); + byte[] addr = getLocalAddress(); + StringBuffer buf = new StringBuffer(); + for(int i = 0; i < addr.length; ++i) + { + if(i != 0) + { + buf.append('.'); + } + buf.append(Byte.toString(addr[i])); + } + return buf.toString(); } public static byte[] |