diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-12-10 23:06:54 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-12-10 23:06:54 +0000 |
| commit | 66244ee7ec1484ed591c51642b04ff1c1814f5e7 (patch) | |
| tree | 8cf19107f2a47ed8cebfd4e08202b4ac8130deb9 | |
| parent | c1ac712f62f89a6fc5c42e410c49e864bf388c1e (diff) | |
| download | classpath-66244ee7ec1484ed591c51642b04ff1c1814f5e7.tar.gz | |
2006-12-10 Andrew John Hughes <gnu_andrew@member.fsf.org>
* gnu/java/lang/management/BeanImpl.java:
(translate(String)): Comment out code for using type
variables for Map and List.
* java/lang/Thread.java:
(Thread(ThreadGroup,Runnable,String,long)): Fix
incrementation of totalThreadsCreated to be prior to use.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gnu/java/lang/management/BeanImpl.java | 8 | ||||
| -rw-r--r-- | java/lang/Thread.java | 2 |
3 files changed, 16 insertions, 3 deletions
@@ -1,5 +1,14 @@ 2006-12-10 Andrew John Hughes <gnu_andrew@member.fsf.org> + * gnu/java/lang/management/BeanImpl.java: + (translate(String)): Comment out code for using type + variables for Map and List. + * java/lang/Thread.java: + (Thread(ThreadGroup,Runnable,String,long)): Fix + incrementation of totalThreadsCreated to be prior to use. + +2006-12-10 Andrew John Hughes <gnu_andrew@member.fsf.org> + * javax/management/MBeanServerFactory.java: (createMBeanServer(String)): Added security check. (findMBeanServer(String)): Likewise. diff --git a/gnu/java/lang/management/BeanImpl.java b/gnu/java/lang/management/BeanImpl.java index 10ae420b3..dcd63ed75 100644 --- a/gnu/java/lang/management/BeanImpl.java +++ b/gnu/java/lang/management/BeanImpl.java @@ -478,6 +478,7 @@ public class BeanImpl { OpenType k = SimpleType.VOID; OpenType v = SimpleType.VOID; + /* TypeVariable[] vars = c.getTypeParameters(); for (int a = 0; a < vars.length; ++a) { @@ -486,6 +487,7 @@ public class BeanImpl if (vars[a].getName().equals("V")) v = getTypeFromClass((Class) vars[a].getGenericDeclaration()); } + */ CompositeType ctype = new CompositeType(Map.class.getName(), Map.class.getName(), new String[] { "key", "value" }, new String[] { "Map key", "Map value"}, @@ -499,9 +501,11 @@ public class BeanImpl if (List.class.isAssignableFrom(c)) { OpenType e = SimpleType.VOID; - TypeVariable[] vars = c.getTypeParameters(); - if (vars.length > 0) + /* + TypeVariable[] vars = c.getTypeParameters(); + if (vars.length > 0) e = getTypeFromClass((Class) vars[0].getGenericDeclaration()); + */ return new OpenMBeanParameterInfoSupport("TransParam", "Translated parameter", new ArrayType(1, e) diff --git a/java/lang/Thread.java b/java/lang/Thread.java index 551cd1b9e..01b380b67 100644 --- a/java/lang/Thread.java +++ b/java/lang/Thread.java @@ -417,7 +417,7 @@ public class Thread implements Runnable contextClassLoaderIsSystemClassLoader = true; synchronized (Thread.class) { - this.threadId = totalThreadsCreated++; + this.threadId = ++totalThreadsCreated; } } |