From: Sam Ruby <rubys@php.net>
Date: Thu, 17 Feb 2000 06:44:14 +0000 (+0000)
Subject: Allow non-public enumerations to be accessed
X-Git-Tag: BEFORE_SAPI_POST_PATCH_17_FEB_2000~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08dc9ba24f7d4ab12dc61b2097dc3626bc3c25dc;p=php

Allow non-public enumerations to be accessed
---

diff --git a/ext/java/reflect.java b/ext/java/reflect.java
index b282aa0932..52d39857db 100644
--- a/ext/java/reflect.java
+++ b/ext/java/reflect.java
@@ -197,6 +197,23 @@ class reflect {
   public static void Invoke
     (Object object, String method, Object args[], long result)
   {
+
+    // Apparently, if a class is not declared "public" it is illegal to
+    // access a method of this class via Invoke.  We can't work around
+    // all such cases, but enumeration does appear to be a common case.
+    if (object instanceof Enumeration && args.length == 0) {
+
+      if (method.equalsIgnoreCase("hasMoreElements")) {
+        setResultFromBoolean(result, ((Enumeration)object).hasMoreElements());
+        return;
+      }
+
+      if (method.equalsIgnoreCase("nextElement")) {
+        setResultFromObject(result, ((Enumeration)object).nextElement());
+        return;
+      }
+    }
+
     try {
       Vector matches = new Vector();
 
diff --git a/ext/rpc/java/reflect.java b/ext/rpc/java/reflect.java
index b282aa0932..52d39857db 100644
--- a/ext/rpc/java/reflect.java
+++ b/ext/rpc/java/reflect.java
@@ -197,6 +197,23 @@ class reflect {
   public static void Invoke
     (Object object, String method, Object args[], long result)
   {
+
+    // Apparently, if a class is not declared "public" it is illegal to
+    // access a method of this class via Invoke.  We can't work around
+    // all such cases, but enumeration does appear to be a common case.
+    if (object instanceof Enumeration && args.length == 0) {
+
+      if (method.equalsIgnoreCase("hasMoreElements")) {
+        setResultFromBoolean(result, ((Enumeration)object).hasMoreElements());
+        return;
+      }
+
+      if (method.equalsIgnoreCase("nextElement")) {
+        setResultFromObject(result, ((Enumeration)object).nextElement());
+        return;
+      }
+    }
+
     try {
       Vector matches = new Vector();