Check if data encoding is registered with EncodingManager

eclipse · Sep 15, 2022 · 95bbbe1 · 95bbbe1
1 parent 3239f40
commit 95bbbe1
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/...er/src/main/java/org/eclipse/milo/opcua/sdk/server/subscriptions/SubscriptionManager.java b/...er/src/main/java/org/eclipse/milo/opcua/sdk/server/subscriptions/SubscriptionManager.java
@@ -46,7 +46,6 @@
 import org.eclipse.milo.opcua.stack.core.StatusCodes;
 import org.eclipse.milo.opcua.stack.core.UaException;
 import org.eclipse.milo.opcua.stack.core.UaSerializationException;
-import org.eclipse.milo.opcua.stack.core.types.DataTypeEncoding;
 import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue;
 import org.eclipse.milo.opcua.stack.core.types.builtin.DiagnosticInfo;
 import org.eclipse.milo.opcua.stack.core.types.builtin.ExtensionObject;
@@ -449,10 +448,7 @@ private BaseMonitoredItem<?> createMonitoredItem(
                 throw new UaException(StatusCodes.Bad_DataEncodingInvalid);
             }
 
-            // TODO this should check with EncodingManager instead
-            if (!dataEncoding.equals(DataTypeEncoding.BINARY_ENCODING_NAME) &&
-                !dataEncoding.equals(DataTypeEncoding.XML_ENCODING_NAME)) {
-
+            if (!server.getEncodingManager().hasEncoding(dataEncoding)) {
                 throw new UaException(StatusCodes.Bad_DataEncodingUnsupported);
             }
         }