summaryrefslogtreecommitdiffstats
path: root/libjava
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2005-12-16 21:38:45 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2005-12-16 21:38:45 +0000
commit8057f15bcbf25f55888961fde6aab3dedda283a6 (patch)
tree940a7d033b6d8b02ff217208f736495af83aac11 /libjava
parentb03baa3956c1b1ae8decb6414bfc5fec92d2e2b0 (diff)
downloadppe42-gcc-8057f15bcbf25f55888961fde6aab3dedda283a6.tar.gz
ppe42-gcc-8057f15bcbf25f55888961fde6aab3dedda283a6.zip
* java/lang/Class.java (getPackage): Get package from
VMClassLoader if needed. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@108685 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/lang/Class.java6
2 files changed, 8 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 35e8b551374..18fe970049f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,10 @@
2005-12-16 Tom Tromey <tromey@redhat.com>
+ * java/lang/Class.java (getPackage): Get package from
+ VMClassLoader if needed.
+
+2005-12-16 Tom Tromey <tromey@redhat.com>
+
* testsuite/libjava.jacks/jacks.xfail
(8.5.2-accessible-static-member-usage-3): Removed.
diff --git a/libjava/java/lang/Class.java b/libjava/java/lang/Class.java
index da84bfd7f4c..60ca4577e99 100644
--- a/libjava/java/lang/Class.java
+++ b/libjava/java/lang/Class.java
@@ -455,8 +455,7 @@ public final class Class implements Serializable
/**
* Returns the <code>Package</code> in which this class is defined
* Returns null when this information is not available from the
- * classloader of this class or when the classloader of this class
- * is null.
+ * classloader of this class.
*
* @return the package for this class, if it is available
* @since 1.2
@@ -466,7 +465,8 @@ public final class Class implements Serializable
ClassLoader cl = getClassLoader();
if (cl != null)
return cl.getPackage(getPackagePortion(getName()));
- return null;
+ else
+ return VMClassLoader.getPackage(getPackagePortion(getName()));
}
/**
OpenPOWER on IntegriCloud