Skip to content

Commit aec7e12

Browse files
committed
GH-81 use writeObject()/readObject() to serialize javaClassPath
1 parent cced736 commit aec7e12

File tree

2 files changed

+21
-16
lines changed

2 files changed

+21
-16
lines changed

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/global/CommonConstants.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,5 +324,6 @@ public interface CommonConstants {
324324
public static final int AGENT_VERSION_82 = 17;
325325
public static final int AGENT_VERSION_90 = 18;
326326
public static final int AGENT_VERSION_VISUALVM_20 = 19;
327-
public static final int CURRENT_AGENT_VERSION = AGENT_VERSION_VISUALVM_20;
327+
public static final int AGENT_VERSION_VISUALVM_206 = 20;
328+
public static final int CURRENT_AGENT_VERSION = AGENT_VERSION_VISUALVM_206;
328329
}

visualvm/libs.profiler/lib.profiler/src/org/graalvm/visualvm/lib/jfluid/wireprotocol/VMPropertiesResponse.java

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -181,26 +181,30 @@ public String toString() {
181181
}
182182

183183
void readObject(ObjectInputStream in) throws IOException {
184-
agentVersion = in.readInt();
185-
jdkVersionString = in.readUTF();
186-
javaClassPath = in.readUTF();
187-
javaExtDirs = in.readUTF();
188-
bootClassPath = in.readUTF();
189-
workingDir = in.readUTF();
190-
jvmArguments = in.readUTF();
191-
javaCommand = in.readUTF();
192-
targetMachineOSName = in.readUTF();
193-
canInstrumentConstructor = in.readBoolean();
194-
maxHeapSize = in.readLong();
195-
startupTimeMillis = in.readLong();
196-
startupTimeInCounts = in.readLong();
197-
agentId = in.readInt();
184+
try {
185+
agentVersion = in.readInt();
186+
jdkVersionString = in.readUTF();
187+
javaClassPath = (String) in.readObject();
188+
javaExtDirs = in.readUTF();
189+
bootClassPath = in.readUTF();
190+
workingDir = in.readUTF();
191+
jvmArguments = in.readUTF();
192+
javaCommand = in.readUTF();
193+
targetMachineOSName = in.readUTF();
194+
canInstrumentConstructor = in.readBoolean();
195+
maxHeapSize = in.readLong();
196+
startupTimeMillis = in.readLong();
197+
startupTimeInCounts = in.readLong();
198+
agentId = in.readInt();
199+
} catch (ClassNotFoundException ex) {
200+
throw new IOException(ex);
201+
}
198202
}
199203

200204
void writeObject(ObjectOutputStream out) throws IOException {
201205
out.writeInt(agentVersion);
202206
out.writeUTF(jdkVersionString);
203-
out.writeUTF(javaClassPath);
207+
out.writeObject(javaClassPath);
204208
out.writeUTF(javaExtDirs);
205209
out.writeUTF(bootClassPath);
206210
out.writeUTF(workingDir);

0 commit comments

Comments
 (0)