Attachment #32450 for bug #122580




     */
    public byte[] preProcess(String className, byte[] bytes, ClassLoader loader) {
        //TODO AV needs to doc that
        if (loader == null || className == null || className.startsWith("org/aspectj/")) {
            // skip boot loader, null classes (hibernate), and any AspectJ implementation classes (if weaving into aspectjweaver.jar) 
            return bytes;
        }



    static class ExplicitlyInitializedClassLoaderWeavingAdaptor {
        private final ClassLoaderWeavingAdaptor weavingAdaptor;
        private final static int NOT_INITIALIZED = 0;
        private final static int IS_INITIALIZING = 1;
        private final static int FINISHED_INITIALIZING = 2;
        private int initializationState;

        public ExplicitlyInitializedClassLoaderWeavingAdaptor(ClassLoaderWeavingAdaptor weavingAdaptor) {
            this.weavingAdaptor = weavingAdaptor;
            this.initializationState = NOT_INITIALIZED;
        }

        private void initialize(ClassLoader loader, IWeavingContext weavingContext) {
        	//thread safety?
            if (initializationState == NOT_INITIALIZED) {
            	initializationState = IS_INITIALIZING;
                weavingAdaptor.initialize(loader, weavingContext);
            	initializationState = FINISHED_INITIALIZING;
            }
        }
        
        public ClassLoaderWeavingAdaptor getWeavingAdaptor(ClassLoader loader, IWeavingContext weavingContext) {
            if (initializationState == IS_INITIALIZING) {
            	// can't weave myself while initializing: the null return causes the system to return unwoven bytes 
            	return null;
            }
            initialize(loader, weavingContext);
            return weavingAdaptor;
        }

Return to bug 122580

Lines 52-59 Link Here

(-)src/org/aspectj/weaver/loadtime/Aj.java (-7 / +16 lines)
52	*/	52	*/
53	public byte[] preProcess(String className, byte[] bytes, ClassLoader loader) {	53	public byte[] preProcess(String className, byte[] bytes, ClassLoader loader) {
54	//TODO AV needs to doc that	54	//TODO AV needs to doc that
55	if (loader == null \|\| className == null) {	55	if (loader == null \|\| className == null \|\| className.startsWith("org/aspectj/")) {
56	// skip boot loader or null classes (hibernate)	56	// skip boot loader, null classes (hibernate), and any AspectJ implementation classes (if weaving into aspectjweaver.jar)
57	return bytes;	57	return bytes;
58	}	58	}
59		59
Lines 117-137 Link Here
117		117
118	static class ExplicitlyInitializedClassLoaderWeavingAdaptor {	118	static class ExplicitlyInitializedClassLoaderWeavingAdaptor {
119	private final ClassLoaderWeavingAdaptor weavingAdaptor;	119	private final ClassLoaderWeavingAdaptor weavingAdaptor;
120	private boolean isInitialized;	120	private final static int NOT_INITIALIZED = 0;
		121	private final static int IS_INITIALIZING = 1;
		122	private final static int FINISHED_INITIALIZING = 2;
		123	private int initializationState;
121		124
122	public ExplicitlyInitializedClassLoaderWeavingAdaptor(ClassLoaderWeavingAdaptor weavingAdaptor) {	125	public ExplicitlyInitializedClassLoaderWeavingAdaptor(ClassLoaderWeavingAdaptor weavingAdaptor) {
123	this.weavingAdaptor = weavingAdaptor;	126	this.weavingAdaptor = weavingAdaptor;
124	this.isInitialized = false;	127	this.initializationState = NOT_INITIALIZED;
125	}	128	}
126		129
127	private void initialize(ClassLoader loader, IWeavingContext weavingContext) {	130	private void initialize(ClassLoader loader, IWeavingContext weavingContext) {
128	if (!isInitialized) {	131	//thread safety?
129	isInitialized = true;	132	if (initializationState == NOT_INITIALIZED) {
		133	initializationState = IS_INITIALIZING;
130	weavingAdaptor.initialize(loader, weavingContext);	134	weavingAdaptor.initialize(loader, weavingContext);
		135	initializationState = FINISHED_INITIALIZING;
131	}	136	}
132	}	137	}
133		138
134	public ClassLoaderWeavingAdaptor getWeavingAdaptor(ClassLoader loader, IWeavingContext weavingContext) {	139	public ClassLoaderWeavingAdaptor getWeavingAdaptor(ClassLoader loader, IWeavingContext weavingContext) {
		140	if (initializationState == IS_INITIALIZING) {
		141	// can't weave myself while initializing: the null return causes the system to return unwoven bytes
		142	return null;
		143	}
135	initialize(loader, weavingContext);	144	initialize(loader, weavingContext);
136	return weavingAdaptor;	145	return weavingAdaptor;
137	}	146	}