Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2008-09-09 14:08:47 -0400
committerpelder2008-09-09 14:08:47 -0400
commit43ffe7d9094fc0260e7aede2ce834fbd637c8fa4 (patch)
treee6095e2a653846dd2d0f3fcd66916b4dbb4ed789
parentd3aac68d52ecc89fcd96b46958929478f535015c (diff)
downloadorg.eclipse.jet-43ffe7d9094fc0260e7aede2ce834fbd637c8fa4.tar.gz
org.eclipse.jet-43ffe7d9094fc0260e7aede2ce834fbd637c8fa4.tar.xz
org.eclipse.jet-43ffe7d9094fc0260e7aede2ce834fbd637c8fa4.zip
[195397] Custom XPath functions defined in a JET transformation are not resolved if the transformation is dynamically loaded.
[246570] Possible Eclipse dead-lock during JET XPath function initialization
-rw-r--r--plugins/org.eclipse.jet/src/org/eclipse/jet/internal/runtime/JETBundleManager.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/runtime/JETBundleManager.java b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/runtime/JETBundleManager.java
index 36a8fd4..90ba1ce 100644
--- a/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/runtime/JETBundleManager.java
+++ b/plugins/org.eclipse.jet/src/org/eclipse/jet/internal/runtime/JETBundleManager.java
@@ -34,6 +34,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jet.JET2TemplateLoader;
import org.eclipse.jet.internal.InternalJET2Platform;
+import org.eclipse.jet.internal.InternalJET2Platform.IMethodTimer;
import org.eclipse.jet.internal.core.url.URLUtility;
import org.eclipse.jet.internal.extensionpoints.TransformData;
import org.eclipse.jet.internal.extensionpoints.TransformDataFactory;
@@ -252,6 +253,8 @@ public class JETBundleManager implements IJETBundleManager
public void shutdown()
{
+ IMethodTimer timer = InternalJET2Platform.getStartupMethodTimer(getClass(), "shutdown()"); //$NON-NLS-1$
+
for (Iterator i = bundlesById.values().iterator(); i.hasNext();)
{
BundleWrapper wrappedBundle = (BundleWrapper)i.next();
@@ -279,11 +282,15 @@ public class JETBundleManager implements IJETBundleManager
additionalBundleLocationProvider = null;
providerSearchOrder = null;
+
+ timer.done();
}
public void startup()
{
+ IMethodTimer timer = InternalJET2Platform.getStartupMethodTimer(getClass(), "startup()"); //$NON-NLS-1$
+
// setup the extension 'org.eclipse.jet.transform' listener on loaded Eclipse plug-ins
installedBundleProvider = new InstalledJETBundleProvider();
installedBundleProvider.startup();
@@ -305,6 +312,8 @@ public class JETBundleManager implements IJETBundleManager
additionalBundleLocationProvider,
deployedBundleProvider,
};
+
+ timer.done();
}
/* (non-Javadoc)

Back to the top