procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Imported GNU Classpath 0.92

Browse source 
2006-08-14  Mark Wielaard  <mark@klomp.org>

       Imported GNU Classpath 0.92
       * HACKING: Add more importing hints. Update automake version
       requirement.

       * configure.ac (gconf-peer): New enable AC argument.
       Add --disable-gconf-peer and --enable-default-preferences-peer
       to classpath configure when gconf is disabled.
       * scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
       gnu/java/awt/dnd/peer/gtk to bc. Classify
       gnu/java/security/Configuration.java as generated source file.

       * gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
       gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
       gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
       gnu/java/lang/management/VMThreadMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryMXBeanImpl.java,
       gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
       classes.
       * java/lang/management/VMManagementFactory.java: Likewise.
       * java/net/VMURLConnection.java: Likewise.
       * gnu/java/nio/VMChannel.java: Likewise.

       * java/lang/Thread.java (getState): Add stub implementation.
       * java/lang/Class.java (isEnum): Likewise.
       * java/lang/Class.h (isEnum): Likewise.

       * gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.

       * javax/naming/spi/NamingManager.java: New override for StackWalker
       functionality.

       * configure, sources.am, Makefile.in, gcj/Makefile.in,
       include/Makefile.in, testsuite/Makefile.in: Regenerated.

From-SVN: r116139
This commit is contained in:
Mark Wielaard 2006-08-14 23:12:35 +00:00
parent abab460491
commit ac1ed908de
1294 changed files with 99479 additions and 35933 deletions
Download patch file Download diff file Expand all files Collapse all files

30
libjava/classpath/java/rmi/server/UID.java
View file

@ -94,23 +94,23 @@ public final class UID
* The time stamp, when the UID was created.
*/
private long time;
/**
* Create the new UID that would have the described features of the
* uniqueness.
*/
public UID()
{
time = System.currentTimeMillis();
unique = machineId;
if (time > last)
synchronized (UID.class)
{
last = time;
count = uidCounter = Short.MIN_VALUE;
}
else
{
synchronized (UID.class)
time = System.currentTimeMillis();
unique = machineId;
if (time > last)
{
last = time;
count = uidCounter = Short.MIN_VALUE;
}
else
{
if (uidCounter == Short.MAX_VALUE)
{
@ -126,8 +126,7 @@ public final class UID
uidCounter = Short.MIN_VALUE;
time = last = System.currentTimeMillis();
}
count = uidCounter++;
count = ++uidCounter;
}
}
}
@ -210,7 +209,7 @@ public final class UID
^ hostIpHash;
}
/**
/**
* Get the string representation of this UID.
*
* @return a string, uniquely identifying this id.
@ -219,9 +218,8 @@ public final class UID
{
int max = Character.MAX_RADIX;
// Translate into object count, counting from 0.
long lc = (count + Short.MIN_VALUE) & 0xFFFF;
return Long.toString(time, max) + ":"
+ Long.toString(unique, max) + ":"
long lc = (count - Short.MIN_VALUE) & 0xFFFF;
return Long.toString(unique, max) + ":" + Long.toString(time, max) + "."
+ Long.toString(lc, max);
}
}