Skip to content

Commit d68775d

Browse files
committed
8351995: JFR: Leftovers from removal of Security Manager
Reviewed-by: mgronlun
1 parent e62becc commit d68775d

File tree

7 files changed

+2
-129
lines changed

7 files changed

+2
-129
lines changed

src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
import java.lang.classfile.FieldModel;
4949
import java.lang.classfile.Label;
5050
import java.lang.classfile.MethodModel;
51-
import java.lang.classfile.Opcode;
5251
import java.lang.classfile.TypeKind;
5352
import java.lang.classfile.attribute.RuntimeVisibleAnnotationsAttribute;
5453
import jdk.jfr.internal.event.EventConfiguration;

src/jdk.jfr/share/classes/jdk/jfr/internal/EventWriterKey.java

Lines changed: 0 additions & 122 deletions
This file was deleted.

src/jdk.jfr/share/classes/jdk/jfr/internal/JVMUpcalls.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ static byte[] bytesForEagerInstrumentation(long traceId, boolean forceInstrument
128128
Bytecode.log(ei.getClassName() + "(" + traceId + ")", bytes);
129129
return bytes;
130130
} catch (Throwable t) {
131-
Logger.log(LogTag.JFR_SYSTEM, LogLevel.WARN, "Unexpected error when adding instrumentation for event type " + eventName);
131+
Logger.log(LogTag.JFR_SYSTEM, LogLevel.WARN, "Unexpected error when adding instrumentation for event type " + eventName + ". " + t.getMessage());
132132
return oldBytes;
133133
}
134134
}

src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformRecording.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ public final class PlatformRecording implements AutoCloseable {
9393
private long finalStartChunkNanos = Long.MIN_VALUE;
9494
private long startNanos = -1;
9595

96-
@SuppressWarnings("removal")
9796
PlatformRecording(PlatformRecorder recorder, long id) {
9897
this.id = id;
9998
this.recorder = recorder;

src/jdk.jfr/share/classes/jdk/jfr/internal/ShutdownHook.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private void dump(PlatformRecording recording) {
6767
}
6868
} catch (Exception e) {
6969
if (Logger.shouldLog(LogTag.JFR, LogLevel.DEBUG)) {
70-
Logger.log(LogTag.JFR, LogLevel.DEBUG, "Could not dump recording " + recording.getName() + " on exit.");
70+
Logger.log(LogTag.JFR, LogLevel.DEBUG, "Could not dump recording " + recording.getName() + " on exit. " + e.getMessage());
7171
}
7272
}
7373
}

src/jdk.management.jfr/share/classes/jdk/management/jfr/FlightRecorderMXBeanImpl.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,12 @@ final class MXBeanListener implements FlightRecorderListener {
7777
private final NotificationFilter filter;
7878
private final Object handback;
7979

80-
@SuppressWarnings("removal")
8180
public MXBeanListener(NotificationListener listener, NotificationFilter filter, Object handback) {
8281
this.listener = listener;
8382
this.filter = filter;
8483
this.handback = handback;
8584
}
8685

87-
@SuppressWarnings("removal")
8886
public void recordingStateChanged(Recording recording) {
8987
sendNotification(createNotification(recording));
9088
}

src/jdk.management.jfr/share/classes/jdk/management/jfr/RemoteRecordingStream.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,6 @@ public RemoteRecordingStream(MBeanServerConnection connection, Path directory) t
196196
this(connection, directory, false);
197197
}
198198

199-
@SuppressWarnings("removal")
200199
private RemoteRecordingStream(MBeanServerConnection connection, Path directory, boolean delete) throws IOException {
201200
Objects.requireNonNull(connection, "connection");
202201
Objects.requireNonNull(directory, "directory");

0 commit comments

Comments
 (0)