diff --git a/server/src/main/java/org/red5/server/PersistableAttributeStore.java b/server/src/main/java/org/red5/server/PersistableAttributeStore.java
index c00a8f50acb7046530f41c237ed1d04252c12f25..9608dd566658a96d3ac8eee849cfb48a2fb65fc8 100644
--- a/server/src/main/java/org/red5/server/PersistableAttributeStore.java
+++ b/server/src/main/java/org/red5/server/PersistableAttributeStore.java
@@ -248,17 +248,15 @@ public class PersistableAttributeStore extends AttributeStore implements IPersis
     /** {@inheritDoc} */
     @Override
     public boolean setAttributes(Map<String, Object> values) {
-        boolean success = super.setAttributes(values);
         modified();
-        return success;
+        return super.setAttributes(values);
     }
 
     /** {@inheritDoc} */
     @Override
     public boolean setAttributes(IAttributeStore values) {
-        boolean success = super.setAttributes(values);
         modified();
-        return success;
+        return super.setAttributes(values);
     }
 
     /**
@@ -270,11 +268,10 @@ public class PersistableAttributeStore extends AttributeStore implements IPersis
      */
     @Override
     public boolean removeAttribute(String name) {
-        boolean result = super.removeAttribute(name);
-        if (result && name != null && !name.startsWith(IPersistable.TRANSIENT_PREFIX)) {
+        if ((super.removeAttribute(name)) && name != null && !name.startsWith(IPersistable.TRANSIENT_PREFIX)) {
             modified();
         }
-        return result;
+        return (super.removeAttribute(name));
     }
 
     /**