From 8057f15bcbf25f55888961fde6aab3dedda283a6 Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 16 Dec 2005 21:38:45 +0000
Subject: [PATCH] * 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
---
libjava/ChangeLog | 5 +++++
libjava/java/lang/Class.java | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 35e8b551374f..18fe970049f5 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/libjava/java/lang/Class.java b/libjava/java/lang/Class.java
index da84bfd7f4ca..60ca4577e992 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()));
}
/**
--
GitLab