Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2012-03-07 14:07:31 +0000
committerThomas Watson2012-03-07 14:07:31 +0000
commitdf7917acce96102928dcdbf213390660744c33f8 (patch)
treed224a3392bb06a637a3d0962259834e13f3a6164 /bundles/org.eclipse.equinox.weaving.hook
parentf8ceac0dbadd22dc7e587d0bc1cb0505e9fc4a93 (diff)
downloadrt.equinox.bundles-df7917acce96102928dcdbf213390660744c33f8.tar.gz
rt.equinox.bundles-df7917acce96102928dcdbf213390660744c33f8.tar.xz
rt.equinox.bundles-df7917acce96102928dcdbf213390660744c33f8.zip
Bug 373397 - Illegal argument exception while loading dynamicallyv20120307-1407
compiled classes
Diffstat (limited to 'bundles/org.eclipse.equinox.weaving.hook')
-rw-r--r--bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/WeavingHook.java8
2 files changed, 8 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF
index c48568485..1d350d83b 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.weaving.hook/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Aspect Weaving Hooks Plug-in (Incubation)
Bundle-SymbolicName: org.eclipse.equinox.weaving.hook
-Bundle-Version: 1.0.100.qualifier
+Bundle-Version: 1.0.200.qualifier
Fragment-Host: org.eclipse.osgi;bundle-version="[3.2.0,4.0.0)"
Export-Package: org.eclipse.equinox.service.weaving,
org.eclipse.equinox.weaving.adaptors;x-friends:="org.eclipse.equinox.weaving.tests",
diff --git a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/WeavingHook.java b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/WeavingHook.java
index 08ab85e8b..0b7d8f1f7 100644
--- a/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/WeavingHook.java
+++ b/bundles/org.eclipse.equinox.weaving.hook/src/org/eclipse/equinox/weaving/hooks/WeavingHook.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
+ * Copyright (c) 2006, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -140,6 +140,12 @@ public class WeavingHook extends AbstractWeavingHook {
public void recordClassDefine(final String name, final Class clazz,
final byte[] classbytes, final ClasspathEntry classpathEntry,
final BundleEntry entry, final ClasspathManager manager) {
+ if (clazz == null) {
+ if (Debug.DEBUG_GENERAL) {
+ Debug.println("Error in defining class: " + name); //$NON-NLS-1$
+ }
+ return;
+ }
if (entry instanceof WeavingBundleEntry) {
final WeavingBundleEntry ajBundleEntry = (WeavingBundleEntry) entry;
if (!ajBundleEntry.dontWeave()) {

Back to the top