--- /space/src/r551/ant/src-bridge/org/apache/tools/ant/module/bridge/impl/BridgeImpl.java	2006-06-28 18:56:30.000000000 -0400
+++ /tmp/BridgeImpl.java	2006-12-15 17:46:21.000000000 -0500
@@ -507,11 +507,23 @@
                 fs[i].set(p, null);
             }
             // #43113: IntrospectionHelper can hold strong refs to dynamically loaded classes
+            boolean found16helpers = false;
+            boolean found17helpers = false;
+            try {
             Field helpersF = IntrospectionHelper.class.getDeclaredField("helpers");
             helpersF.setAccessible(true);
             Object helpersO = helpersF.get(null);
             Map helpersM = (Map) helpersO;
             helpersM.clear();
+                found16helpers = true;
+            } catch (NoSuchFieldException nsfe) {
+                Field helpers17F = IntrospectionHelper.class.getDeclaredField ("HELPERS");
+                helpers17F.setAccessible (true);
+                Object helpers170 = helpers17F.get (null);
+                Map helpers17M = (Map) helpers170;
+                helpers17M.clear ();
+                found17helpers = true;
+            }
             // #46532: java.beans.Introspector caches not cleared well in all cases.
             Introspector.flushCaches();
         } catch (Exception e) {