X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FLockableScore.java;h=7716950af939df3dac28f489a0cdce1dbc47cf12;hb=1854b5cebef22ace9e9e4dd191f609818df9ce08;hp=4cb8fdaee56415f7bc5181eb943f219e91752cf7;hpb=5fd405f7a48aaeca779c45c88ec6b3d3d3dbf0e4;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/LockableScore.java b/src/main/java/org/ldk/structs/LockableScore.java
index 4cb8fdaee..7716950a 100644
--- a/src/main/java/org/ldk/structs/LockableScore.java
+++ b/src/main/java/org/ldk/structs/LockableScore.java
@@ -4,9 +4,9 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import java.lang.ref.Reference;
 import javax.annotation.Nullable;
 
-
 /**
  * A scorer that is accessed under a lock.
  * 
@@ -19,31 +19,47 @@ import javax.annotation.Nullable;
  */
 @SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class LockableScore extends CommonBase {
-	LockableScore(Object _dummy, long ptr) { super(ptr); }
+	final bindings.LDKLockableScore bindings_instance;
+	LockableScore(Object _dummy, long ptr) { super(ptr); bindings_instance = null; }
+	private LockableScore(bindings.LDKLockableScore arg) {
+		super(bindings.LDKLockableScore_new(arg));
+		this.ptrs_to.add(arg);
+		this.bindings_instance = arg;
+	}
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
-		super.finalize();
-		if (ptr != 0) { bindings.LockableScore_free(ptr); }
+		if (ptr != 0) { bindings.LockableScore_free(ptr); } super.finalize();
 	}
 
+	public static interface LockableScoreInterface {
+		/**
+		 * Returns the locked scorer.
+		 */
+		Score lock();
+	}
+	private static class LDKLockableScoreHolder { LockableScore held; }
+	public static LockableScore new_impl(LockableScoreInterface arg) {
+		final LDKLockableScoreHolder impl_holder = new LDKLockableScoreHolder();
+		impl_holder.held = new LockableScore(new bindings.LDKLockableScore() {
+			@Override public long lock() {
+				Score ret = arg.lock();
+				long result = ret == null ? 0 : ret.ptr;
+				impl_holder.held.ptrs_to.add(ret);
+				return result;
+			}
+		});
+		return impl_holder.held;
+	}
 	/**
-	 * Constructs a new LockableScore from a Score
+	 * Returns the locked scorer.
 	 */
-	public static LockableScore of(Score score) {
-		long ret = bindings.LockableScore_new(score == null ? 0 : score.ptr);
+	public Score lock() {
+		long ret = bindings.LockableScore_lock(this.ptr);
+		Reference.reachabilityFence(this);
 		if (ret >= 0 && ret <= 4096) { return null; }
-		LockableScore ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new LockableScore(null, ret); }
-		ret_hu_conv.ptrs_to.add(ret_hu_conv);
-		ret_hu_conv.ptrs_to.add(score);
+		Score ret_hu_conv = new Score(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
 
-	/**
-	 * Serialize the LockableScore object into a byte array which can be read by LockableScore_read
-	 */
-	public byte[] write() {
-		byte[] ret = bindings.LockableScore_write(this.ptr);
-		return ret;
-	}
-
 }