diff --git a/isolates/src/main/java/com/salesforce/apollo/demesnes/isolate/DemesneIsolate.java b/isolates/src/main/java/com/salesforce/apollo/demesnes/isolate/DemesneIsolate.java index e110aa0a6..dc8c48e3c 100644 --- a/isolates/src/main/java/com/salesforce/apollo/demesnes/isolate/DemesneIsolate.java +++ b/isolates/src/main/java/com/salesforce/apollo/demesnes/isolate/DemesneIsolate.java @@ -7,14 +7,14 @@ package com.salesforce.apollo.demesnes.isolate; import com.google.protobuf.InvalidProtocolBufferException; +import com.salesforce.apollo.cryptography.Digest; import com.salesforce.apollo.cryptography.proto.Digeste; import com.salesforce.apollo.demesne.proto.DemesneParameters; import com.salesforce.apollo.demesne.proto.ViewChange; -import com.salesforce.apollo.stereotomy.event.proto.*; -import com.salesforce.apollo.cryptography.Digest; import com.salesforce.apollo.model.demesnes.Demesne; import com.salesforce.apollo.model.demesnes.DemesneImpl; import com.salesforce.apollo.stereotomy.EventCoordinates; +import com.salesforce.apollo.stereotomy.event.proto.*; import com.salesforce.apollo.stereotomy.identifier.SelfAddressingIdentifier; import com.salesforce.apollo.stereotomy.identifier.spec.IdentifierSpecification; import com.salesforce.apollo.stereotomy.identifier.spec.RotationSpecification; @@ -57,7 +57,7 @@ public class DemesneIsolate { private static boolean active(JNIEnvironment jniEnv, JClass clazz, @CEntryPoint.IsolateThreadContext long isolateId) throws GeneralSecurityException { final Demesne d = demesne.get(); - return d == null ? false : d.active(); + return d != null && d.active(); } @CEntryPoint(name = "Java_com_salesforce_apollo_model_demesnes_JniBridge_commit") @@ -227,16 +227,6 @@ private static void stop(JNIEnvironment jniEnv, JClass clazz, @CEntryPoint.Isola } } - private static JByteArray toByteArray(InceptionEvent rotate) { - // TODO Auto-generated method stub - return null; - } - - private static JByteArray toByteArray(RotationEvent rotate) { - // TODO Auto-generated method stub - return null; - } - @CEntryPoint(name = "Java_com_salesforce_apollo_model_demesnes_JniBridge_viewChange") private static boolean viewChange(JNIEnvironment jniEnv, JClass clazz, @CEntryPoint.IsolateThreadContext long isolateId, JByteArray vc, int size) {