Skip to content

Commit 6762f93

Browse files
committed
reuse
1 parent 9a0b216 commit 6762f93

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/OpcUaNameSpace.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,11 @@ public class OpcUaNameSpace extends ManagedNamespaceWithLifecycle {
7171
public static final String NAMESPACE_URI = "urn:apache:iotdb:opc-server";
7272
private final SubscriptionModel subscriptionModel;
7373
private final OpcUaServerBuilder builder;
74-
private final String placeHolder;
7574

7675
OpcUaNameSpace(
77-
final OpcUaServer server, final OpcUaServerBuilder builder, final String placeHolder) {
76+
final OpcUaServer server, final OpcUaServerBuilder builder) {
7877
super(server, NAMESPACE_URI);
7978
this.builder = builder;
80-
this.placeHolder = placeHolder;
8179

8280
subscriptionModel = new SubscriptionModel(server, this);
8381
getLifecycleManager().addLifecycle(subscriptionModel);
@@ -147,7 +145,7 @@ private void transferTabletForClientServerModel(
147145
folderSegments[0] = sink.unQualifiedDatabaseName;
148146

149147
for (int j = 0; j < segments.length; ++j) {
150-
folderSegments[j + 1] = Objects.isNull(segments[j]) ? placeHolder : (String) segments[j];
148+
folderSegments[j + 1] = Objects.isNull(segments[j]) ? sink.placeHolder : (String) segments[j];
151149
}
152150

153151
final int finalI = i;
@@ -351,7 +349,7 @@ private void transferTabletForPubSubModel(
351349
for (final Object segment : tablet.getDeviceID(i).getSegments()) {
352350
idBuilder
353351
.append(TsFileConstant.PATH_SEPARATOR)
354-
.append(Objects.isNull(segment) ? placeHolder : segment);
352+
.append(Objects.isNull(segment) ? sink.placeHolder : segment);
355353
}
356354
sourceNameList.add(idBuilder.toString());
357355
}

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/sink/protocol/opcua/OpcUaSink.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ public void customize(
225225
.setSecurityDir(securityDir)
226226
.setEnableAnonymousAccess(enableAnonymousAccess);
227227
final OpcUaServer newServer = builder.build();
228-
nameSpace = new OpcUaNameSpace(newServer, builder, placeHolder);
228+
nameSpace = new OpcUaNameSpace(newServer, builder);
229229
nameSpace.startup();
230230
newServer.startup().get();
231231
return new Pair<>(new AtomicInteger(0), nameSpace);

0 commit comments

Comments
 (0)