From aeaa12757ee7691b9deda9a07c921c83dd9a6032 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Wed, 29 Apr 2009 00:56:32 +0000
Subject: [PATCH] 271840: deadlock in ltw with terracotta

---
 .../ClassPreProcessorAgentAdapter.java        | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/loadtime5/java5-src/org/aspectj/weaver/loadtime/ClassPreProcessorAgentAdapter.java b/loadtime5/java5-src/org/aspectj/weaver/loadtime/ClassPreProcessorAgentAdapter.java
index b292452a4..aa5418c62 100644
--- a/loadtime5/java5-src/org/aspectj/weaver/loadtime/ClassPreProcessorAgentAdapter.java
+++ b/loadtime5/java5-src/org/aspectj/weaver/loadtime/ClassPreProcessorAgentAdapter.java
@@ -17,44 +17,44 @@ import java.security.ProtectionDomain;
 
 /**
  * Java 1.5 adapter for class pre processor
- *
+ * 
  * @author <a href="mailto:alex@gnilux.com">Alexandre Vasseur</a>
  */
 public class ClassPreProcessorAgentAdapter implements ClassFileTransformer {
 
-    /**
-     * Concrete preprocessor.
-     */
-    private static ClassPreProcessor s_preProcessor;
+	/**
+	 * Concrete preprocessor.
+	 */
+	private static ClassPreProcessor s_preProcessor;
 
-    static {
-        try {
-            s_preProcessor = new Aj();
-            s_preProcessor.initialize();
-        } catch (Exception e) {
-            throw new ExceptionInInitializerError("could not initialize JSR163 preprocessor due to: " + e.toString());
-        }
-    }
+	static {
+		try {
+			s_preProcessor = new Aj();
+			s_preProcessor.initialize();
+		} catch (Exception e) {
+			throw new ExceptionInInitializerError("could not initialize JSR163 preprocessor due to: " + e.toString());
+		}
+	}
 
-    /**
-     * Weaving delegation
-     *
-     * @param loader              the defining class loader
-     * @param className           the name of class beeing loaded
-     * @param classBeingRedefined when hotswap is called
-     * @param protectionDomain
-     * @param bytes               the bytecode before weaving
-     * @return the weaved bytecode
-     */
-    public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined,
-                            ProtectionDomain protectionDomain, byte[] bytes) throws IllegalClassFormatException {
-        if (classBeingRedefined == null) {
-            return s_preProcessor.preProcess(className, bytes, loader);
-        } else {
-            //FIXME av for now we skip hotswap. We should think more about that
-            new Exception("AspectJ5 does not weave hotswapped class (" + className + ")").printStackTrace();
-            return bytes;
-        }
-    }
+	/**
+	 * Weaving delegation
+	 * 
+	 * @param loader the defining class loader
+	 * @param className the name of class beeing loaded
+	 * @param classBeingRedefined when hotswap is called
+	 * @param protectionDomain
+	 * @param bytes the bytecode before weaving
+	 * @return the weaved bytecode
+	 */
+	public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain,
+			byte[] bytes) throws IllegalClassFormatException {
+		if (classBeingRedefined == null) {
+			return s_preProcessor.preProcess(className, bytes, loader);
+		} else {
+			// FIXME av for now we skip hotswap. We should think more about that
+			new Exception("AspectJ5 does not weave hotswapped class (" + className + ")").printStackTrace();
+			return bytes;
+		}
+	}
 
 }
-- 
2.39.5