diff options
author | Thomas Watson | 2012-07-31 21:08:48 +0000 |
---|---|---|
committer | Thomas Watson | 2012-08-01 20:56:58 +0000 |
commit | a2763d35135b047fdc8aeddf5b63c240a2a79667 (patch) | |
tree | 87053776d3987fac2c0922e1d25d77a6745b1056 /bundles/org.eclipse.osgi | |
parent | 8e66805d457530b12e70d87da03076190de2970f (diff) | |
download | rt.equinox.framework-a2763d35135b047fdc8aeddf5b63c240a2a79667.tar.gz rt.equinox.framework-a2763d35135b047fdc8aeddf5b63c240a2a79667.tar.xz rt.equinox.framework-a2763d35135b047fdc8aeddf5b63c240a2a79667.zip |
update TrustEngin API for new container
Diffstat (limited to 'bundles/org.eclipse.osgi')
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/security/TrustEngine.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/security/TrustEngine.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/security/TrustEngine.java index e4c9c977e..f142c8ecd 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/security/TrustEngine.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/service/security/TrustEngine.java @@ -48,7 +48,7 @@ public abstract class TrustEngine { */ public String addTrustAnchor(Certificate anchor, String alias) throws IOException, GeneralSecurityException { String storedAlias = doAddTrustAnchor(anchor, alias); - TrustEngineListener listener = TrustEngineListener.getInstance(); + TrustEngineListener listener = trustEngineListener; if (listener != null) listener.addedTrustAnchor(anchor); return storedAlias; @@ -76,7 +76,7 @@ public abstract class TrustEngine { */ public final void removeTrustAnchor(Certificate anchor) throws IOException, GeneralSecurityException { doRemoveTrustAnchor(anchor); - TrustEngineListener listener = TrustEngineListener.getInstance(); + TrustEngineListener listener = trustEngineListener; if (listener != null) listener.removedTrustAnchor(anchor); } @@ -99,7 +99,7 @@ public abstract class TrustEngine { Certificate existing = getTrustAnchor(alias); doRemoveTrustAnchor(alias); if (existing != null) { - TrustEngineListener listener = TrustEngineListener.getInstance(); + TrustEngineListener listener = trustEngineListener; if (listener != null) listener.removedTrustAnchor(existing); } @@ -143,4 +143,6 @@ public abstract class TrustEngine { * @return a string */ public abstract String getName(); + + private volatile TrustEngineListener trustEngineListener; } |