diff options
author | Martin Lippert | 2013-01-23 04:20:49 -0500 |
---|---|---|
committer | Martin Lippert | 2013-01-23 04:20:49 -0500 |
commit | 95025f60b123f3cff7003de1b252dc5bc3e0479c (patch) | |
tree | 1aedfb56b2deb76da1adf8cb0f56c2fa123486ff | |
parent | 6f750e799e38f18edc2433b8b5ecdfba699cb70a (diff) | |
download | rt.equinox.bundles-95025f60b123f3cff7003de1b252dc5bc3e0479c.zip rt.equinox.bundles-95025f60b123f3cff7003de1b252dc5bc3e0479c.tar.gz rt.equinox.bundles-95025f60b123f3cff7003de1b252dc5bc3e0479c.tar.xz |
Bug 398862 - adapt to changes in AspectJs GeneratedClassesHandler interface
-rw-r--r-- | bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/loadtime/OSGiWeavingAdaptor.java | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/loadtime/OSGiWeavingAdaptor.java b/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/loadtime/OSGiWeavingAdaptor.java index fcd1691..5fe35d8 100644 --- a/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/loadtime/OSGiWeavingAdaptor.java +++ b/bundles/org.eclipse.equinox.weaving.aspectj/src/org/eclipse/equinox/weaving/aspectj/loadtime/OSGiWeavingAdaptor.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2012 IBM Corporation and others. + * Copyright (c) 2006, 2013 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 @@ -79,7 +79,8 @@ public class OSGiWeavingAdaptor extends ClassLoaderWeavingAdaptor { } /** - * Callback when we need to define a generated class in the JVM + * Callback when we need to define a generated class in the JVM (version + * for older AspectJ versions) */ public void acceptClass(final String name, final byte[] bytes) { try { @@ -92,6 +93,15 @@ public class OSGiWeavingAdaptor extends ClassLoaderWeavingAdaptor { classesToBeDefined.offer(new GeneratedClass(name, bytes)); } + /** + * Callback when we need to define a generated class in the JVM (version + * for newer AspectJ versions, but we can ignore the originalBytes here) + */ + public void acceptClass(final String name, final byte[] originalBytes, + final byte[] weavedBytes) { + acceptClass(name, weavedBytes); + } + public void defineGeneratedClasses() { while (!classesToBeDefined.isEmpty()) { final GeneratedClass generatedClass = classesToBeDefined.poll(); |