Use an atomic reference instead of volatile.

[Sone.git] / src / main / java / net / pterodactylus / sone / fcp / FcpInterface.java

diff --git a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
index 18c017b..1ddf0a9 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java
@@ -22,6 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -41,6 +43,7 @@ import freenet.support.api.Bucket;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.inject.Inject;
+import com.google.inject.Singleton;
 
 /**
  * Implementation of an FCP interface for other clients or plugins to
@@ -48,6 +51,7 @@ import com.google.inject.Inject;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
+@Singleton
 public class FcpInterface {
 
        /**
@@ -72,10 +76,10 @@ public class FcpInterface {
        private static final Logger logger = Logging.getLogger(FcpInterface.class);
 
        /** Whether the FCP interface is currently active. */
-       private volatile boolean active;
+       private final AtomicBoolean active = new AtomicBoolean();
 
        /** What function full access is required for. */
-       private volatile FullAccessRequired fullAccessRequired = FullAccessRequired.ALWAYS;
+       private final AtomicReference<FullAccessRequired> fullAccessRequired = new AtomicReference<FullAccessRequired>(FullAccessRequired.ALWAYS);
 
        /** All available FCP commands. */
        private final Map<String, AbstractSoneCommand> commands = Collections.synchronizedMap(new HashMap<String, AbstractSoneCommand>());
@@ -111,7 +115,7 @@ public class FcpInterface {
 
        @VisibleForTesting
        boolean isActive() {
-               return active;
+               return active.get();
        }
 
        /**
@@ -123,12 +127,12 @@ public class FcpInterface {
         *            deactivate the FCP interface
         */
        public void setActive(boolean active) {
-               this.active = active;
+               this.active.set(active);
        }
 
        @VisibleForTesting
        FullAccessRequired getFullAccessRequired() {
-               return fullAccessRequired;
+               return fullAccessRequired.get();
        }
 
        /**
@@ -138,7 +142,7 @@ public class FcpInterface {
         *            The action level for which full FCP access is required
         */
        public void setFullAccessRequired(FullAccessRequired fullAccessRequired) {
-               this.fullAccessRequired = checkNotNull(fullAccessRequired, "fullAccessRequired must not be null");
+               this.fullAccessRequired.set(checkNotNull(fullAccessRequired, "fullAccessRequired must not be null"));
        }
 
        //
@@ -160,7 +164,7 @@ public class FcpInterface {
         *            {@link FredPluginFCP#ACCESS_FCP_RESTRICTED}
         */
        public void handle(PluginReplySender pluginReplySender, SimpleFieldSet parameters, Bucket data, int accessType) {
-               if (!active) {
+               if (!active.get()) {
                        try {
                                sendReply(pluginReplySender, null, new ErrorResponse(400, "FCP Interface deactivated"));
                        } catch (PluginNotFoundException pnfe1) {
@@ -169,7 +173,7 @@ public class FcpInterface {
                        return;
                }
                AbstractSoneCommand command = commands.get(parameters.get("Message"));
-               if ((accessType == FredPluginFCP.ACCESS_FCP_RESTRICTED) && (((fullAccessRequired == FullAccessRequired.WRITING) && command.requiresWriteAccess()) || (fullAccessRequired == FullAccessRequired.ALWAYS))) {
+               if ((accessType == FredPluginFCP.ACCESS_FCP_RESTRICTED) && (((fullAccessRequired.get() == FullAccessRequired.WRITING) && command.requiresWriteAccess()) || (fullAccessRequired.get() == FullAccessRequired.ALWAYS))) {
                        try {
                                sendReply(pluginReplySender, null, new ErrorResponse(401, "Not authorized"));
                        } catch (PluginNotFoundException pnfe1) {