Fixing issues in async-log

Autocommit Thu Jan 15 07:41:18 EST 2015
mxro · Jan 14, 2015 · 232b7df · 232b7df
1 parent dd57050
commit 232b7df
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/main/java/de/mxro/async/properties/internal/SynchronizedPropertyNode.java b/src/main/java/de/mxro/async/properties/internal/SynchronizedPropertyNode.java
@@ -3,6 +3,7 @@
 import de.mxro.async.AsyncCommon;
 import de.mxro.async.Operation;
 import de.mxro.async.callbacks.ValueCallback;
+import de.mxro.async.properties.PropertyData;
 import de.mxro.async.properties.PropertyNode;
 import de.mxro.async.properties.PropertyOperation;
 import de.mxro.concurrency.schedule.AccessThread;
@@ -31,7 +32,14 @@ public void apply(final ValueCallback<R> callback) {
 
                     @Override
                     public void process() {
-                        decorated.record(op).apply(callback);
+                        final R res;
+                        try {
+                            res = op.perform(decorated.getDataUnsafe());
+                        } catch (final Throwable t) {
+                            callback.onFailure(t);
+                            return;
+                        }
+                        callback.onSuccess(res);
                     }
                 });
                 accessThread.startIfRequired();
@@ -146,4 +154,9 @@ public void process() {
         this.accessThread.startIfRequired();
     }
 
+    @Override
+    public PropertyData getDataUnsafe() {
+        return decorated.getDataUnsafe();
+    }
+
 }
diff --git a/src/main/java/de/mxro/async/properties/internal/UnsafePropertyNode.java b/src/main/java/de/mxro/async/properties/internal/UnsafePropertyNode.java
@@ -143,4 +143,10 @@ public void render(final ValueCallback<String> cb) {
         cb.onSuccess(data.toString());
     }
 
+    @Override
+    public PropertyData getDataUnsafe() {
+
+        return data;
+    }
+
 }