This is an automated email from the ASF dual-hosted git repository. bwalker pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 13f2636 Update merge (#3651) 13f2636 is described below commit 13f2636291d8f693cee95334f17abbb8ee3385fa Author: Brad Walker <bwal...@musings.com> AuthorDate: Mon Feb 21 10:56:12 2022 -0500 Update merge (#3651) I was too agressive with merging my updates. This merge provides fixes that were received by a Netbeans engineer. --- .../lib/profiler/heap/ClassDumpSegment.java | 100 +++++---------------- .../lib/profiler/server/ProfilerRuntimeCPU.java | 20 +---- 2 files changed, 24 insertions(+), 96 deletions(-) diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ClassDumpSegment.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ClassDumpSegment.java index bea63b8..ce45a92 100644 --- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ClassDumpSegment.java +++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/ClassDumpSegment.java @@ -243,105 +243,45 @@ class ClassDumpSegment extends TagBounds { Integer typeObj = null; switch (vmName) { - case "[Z": - // NOI18N - typeObj = HprofHeap.BOOLEAN; - break; + case "[Z": typeObj = HprofHeap.BOOLEAN; break; // NOI18N - case "[C": - // NOI18N - typeObj = HprofHeap.CHAR; - break; + case "[C": typeObj = HprofHeap.CHAR; break; // NOI18N - case "[F": - // NOI18N - typeObj = HprofHeap.FLOAT; - break; + case "[F": typeObj = HprofHeap.FLOAT; break; // NOI18N - case "[D": - // NOI18N - typeObj = HprofHeap.DOUBLE; - break; + case "[D": typeObj = HprofHeap.DOUBLE; break; // NOI18N - case "[B": - // NOI18N - typeObj = HprofHeap.BYTE; - break; + case "[B": typeObj = HprofHeap.BYTE; break; // NOI18N - case "[S": - // NOI18N - typeObj = HprofHeap.SHORT; - break; + case "[S": typeObj = HprofHeap.SHORT; break; // NOI18N - case "[I": - // NOI18N - typeObj = HprofHeap.INT; - break; + case "[I": typeObj = HprofHeap.INT; break; // NOI18N - case "[J": - // NOI18N - typeObj = HprofHeap.LONG; - break; + case "[J": typeObj = HprofHeap.LONG; break; // NOI18N - case "java/lang/Class": - // NOI18N - java_lang_Class = jcls; - break; + case "java/lang/Class": java_lang_Class = jcls; break; // NOI18N - case "java/lang/Object": - // NOI18N - java_lang_Object = jcls; - break; + case "java/lang/Object": java_lang_Object = jcls; break; // NOI18N - case "boolean[]": - // NOI18N - typeObj = HprofHeap.BOOLEAN; - break; + case "boolean[]": typeObj = HprofHeap.BOOLEAN; break; // NOI18N - case "char[]": - // NOI18N - typeObj = HprofHeap.CHAR; - break; + case "char[]": typeObj = HprofHeap.CHAR; break; // NOI18N - case "float[]": - // NOI18N - typeObj = HprofHeap.FLOAT; - break; + case "float[]": typeObj = HprofHeap.FLOAT; break; // NOI18N - case "double[]": - // NOI18N - typeObj = HprofHeap.DOUBLE; - break; + case "double[]": typeObj = HprofHeap.DOUBLE; break; // NOI18N - case "byte[]": - // NOI18N - typeObj = HprofHeap.BYTE; - break; + case "byte[]": typeObj = HprofHeap.BYTE; break; // NOI18N - case "short[]": - // NOI18N - typeObj = HprofHeap.SHORT; - break; + case "short[]": typeObj = HprofHeap.SHORT; break; // NOI18N - case "int[]": - // NOI18N - typeObj = HprofHeap.INT; - break; + case "int[]": typeObj = HprofHeap.INT; break; // NOI18N - case "long[]": - // NOI18N - typeObj = HprofHeap.LONG; - break; + case "long[]": typeObj = HprofHeap.LONG; break; // NOI18N - case "java.lang.Class": - // NOI18N - java_lang_Class = jcls; - break; + case "java.lang.Class": java_lang_Class = jcls; break; // NOI18N - case "java.lang.Object": - // NOI18N - java_lang_Object = jcls; - break; + case "java.lang.Object": java_lang_Object = jcls; break; // NOI18N default: break; diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeCPU.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeCPU.java index febf5c8..9a3e512 100644 --- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeCPU.java +++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntimeCPU.java @@ -339,25 +339,13 @@ public class ProfilerRuntimeCPU extends ProfilerRuntime { int sessionHash = -1; if (null != method) switch (method) { - case "GET": - // NOI18N - methodId = 1; - break; + case "GET": methodId = 1; break; // NOI18N - case "POST": - // NOI18N - methodId = 2; - break; + case "POST": methodId = 2; break; // NOI18N - case "PUT": - // NOI18N - methodId = 3; - break; + case "PUT": methodId = 3; break; // NOI18N - case "DELETE": - // NOI18N - methodId = 4; - break; + case "DELETE": methodId = 4; break; // NOI18N default: break; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists