Skip to content

Commit 536bbf1

Browse files
RealCLangerRealCLanger
authored
Merge pull request #138 from SAP/pr-103487344f7d6dc94a8064b12b2b604103029770-sap
sap: Merge 1034873
2 parents 0141d68 + 1034873 commit 536bbf1

File tree

13 files changed

+76
-248
lines changed

13 files changed

+76
-248
lines changed

‎application/org.openjdk.jmc.browser.attach/src/main/java/org/openjdk/jmc/browser/attach/LocalConnectionDescriptor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public Void call() throws Exception {
150150
}
151151

152152
private void setAddress(String address) {
153-
if (isSelfMonitoring() || address == null) {
153+
if (isSelfMonitoring()) {
154154
// If we're attempting to monitor ourselves, use the local
155155
// JVM (since the poor agent currently may go into infinite
156156
// recursion otherwise).
@@ -160,7 +160,7 @@ private void setAddress(String address) {
160160
// Not going to happen...
161161
LOGGER.log(Level.SEVERE, "Failed to parse url", e);
162162
}
163-
} else {
163+
} else if (address != null) {
164164
try {
165165
url = new JMXServiceURL(address);
166166
} catch (MalformedURLException e) {

‎application/org.openjdk.jmc.browser.attach/src/main/java/org/openjdk/jmc/browser/attach/LocalJVMToolkit.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ public static synchronized DiscoveryEntry[] getAttachableJVMs() {
527527
*/
528528
public static String executeCommandForPid(String pid, String command)
529529
throws AttachNotSupportedException, IOException, AgentLoadException {
530-
return executeCommandForPid(pid, command, false);
530+
return executeCommandForPid(pid, command, true);
531531
}
532532

533533
/**

‎application/org.openjdk.jmc.console.agent/src/main/java/org/openjdk/jmc/console/agent/actions/AgentEditorOpener.java‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import org.eclipse.core.runtime.jobs.Job;
4242
import org.eclipse.jface.dialogs.IDialogConstants;
4343
import org.eclipse.jface.wizard.WizardDialog;
44-
import org.eclipse.osgi.util.NLS;
4544
import org.eclipse.swt.widgets.Button;
4645
import org.eclipse.swt.widgets.Composite;
4746
import org.eclipse.swt.widgets.Display;
@@ -52,7 +51,6 @@
5251
import org.openjdk.jmc.common.action.Executable;
5352
import org.openjdk.jmc.common.io.IOToolkit;
5453
import org.openjdk.jmc.console.agent.AgentJmxHelper;
55-
import org.openjdk.jmc.console.agent.AgentPlugin;
5654
import org.openjdk.jmc.console.agent.editor.AgentEditor;
5755
import org.openjdk.jmc.console.agent.editor.AgentEditorInput;
5856
import org.openjdk.jmc.console.agent.messages.internal.Messages;
@@ -97,13 +95,12 @@ protected IStatus run(IProgressMonitor monitor) {
9795
helper.removeConnectionChangedListener(this);
9896
return ret;
9997
} catch (ConnectionException e) {
100-
IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
101-
DialogToolkit.showException(window.getShell(), Messages.AgentEditorOpener_MESSAGE_COULD_NOT_CONNECT, e);
102-
103-
return new Status(IStatus.ERROR, AgentPlugin.PLUGIN_ID, IStatus.ERROR,
104-
NLS.bind(Messages.AgentEditorOpener_MESSAGE_COULD_NOT_CONNECT,
105-
serverHandle.getServerDescriptor().getDisplayName(), e.getMessage()),
106-
e);
98+
DisplayToolkit.safeAsyncExec(Display.getDefault(), () -> {
99+
IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
100+
DialogToolkit.showException(window.getShell(), Messages.AgentEditorOpener_MESSAGE_COULD_NOT_CONNECT,
101+
e);
102+
});
103+
return Status.CANCEL_STATUS;
107104
}
108105
}
109106

‎pom.xml‎

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
</distributionManagement>
126126
<profiles>
127127
<profile>
128-
<id>2025-06</id>
128+
<id>2025-09</id>
129129
<activation>
130130
<activeByDefault>true</activeByDefault>
131131
</activation>
@@ -139,7 +139,7 @@
139139
<target>
140140
<artifact>
141141
<groupId>org.openjdk.jmc</groupId>
142-
<artifactId>platform-definition-2025-06</artifactId>
142+
<artifactId>platform-definition-2025-09</artifactId>
143143
<version>${revision}${changelist}</version>
144144
</artifact>
145145
</target>
@@ -149,28 +149,7 @@
149149
</build>
150150
</profile>
151151
<profile>
152-
<id>2025-03</id>
153-
<build>
154-
<plugins>
155-
<plugin>
156-
<groupId>org.eclipse.tycho</groupId>
157-
<artifactId>target-platform-configuration</artifactId>
158-
<version>${tycho.version}</version>
159-
<configuration>
160-
<target>
161-
<artifact>
162-
<groupId>org.openjdk.jmc</groupId>
163-
<artifactId>platform-definition-2025-03</artifactId>
164-
<version>${revision}${changelist}</version>
165-
</artifact>
166-
</target>
167-
</configuration>
168-
</plugin>
169-
</plugins>
170-
</build>
171-
</profile>
172-
<profile>
173-
<id>2024-12</id>
152+
<id>2025-06</id>
174153
<build>
175154
<plugins>
176155
<plugin>
@@ -181,7 +160,7 @@
181160
<target>
182161
<artifact>
183162
<groupId>org.openjdk.jmc</groupId>
184-
<artifactId>platform-definition-2024-12</artifactId>
163+
<artifactId>platform-definition-2025-06</artifactId>
185164
<version>${revision}${changelist}</version>
186165
</artifact>
187166
</target>
@@ -191,7 +170,7 @@
191170
</build>
192171
</profile>
193172
<profile>
194-
<id>2024-09</id>
173+
<id>2025-03</id>
195174
<build>
196175
<plugins>
197176
<plugin>
@@ -202,7 +181,7 @@
202181
<target>
203182
<artifact>
204183
<groupId>org.openjdk.jmc</groupId>
205-
<artifactId>platform-definition-2024-09</artifactId>
184+
<artifactId>platform-definition-2025-03</artifactId>
206185
<version>${revision}${changelist}</version>
207186
</artifact>
208187
</target>
@@ -212,7 +191,7 @@
212191
</build>
213192
</profile>
214193
<profile>
215-
<id>2024-06</id>
194+
<id>2024-12</id>
216195
<build>
217196
<plugins>
218197
<plugin>
@@ -223,7 +202,7 @@
223202
<target>
224203
<artifact>
225204
<groupId>org.openjdk.jmc</groupId>
226-
<artifactId>platform-definition-2024-06</artifactId>
205+
<artifactId>platform-definition-2024-12</artifactId>
227206
<version>${revision}${changelist}</version>
228207
</artifact>
229208
</target>

‎releng/platform-definitions/platform-definition-2024-06/platform-definition-2024-06.target‎

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

‎releng/platform-definitions/platform-definition-2024-09/pom.xml‎

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

‎releng/platform-definitions/platform-definition-2024-12/platform-definition-2024-12.target‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@
4949
<unit id="org.jolokia.service.discovery" version="2.0.2"/>
5050
<unit id="org.jolokia.server.core" version="2.0.2"/>
5151
<unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
52-
<unit id="org.eclipse.jetty.websocket.api" version="12.0.21"/>
53-
<unit id="org.eclipse.jetty.ee9.websocket.api" version="12.0.21"/>
54-
<unit id="org.eclipse.jetty.ee9.websocket.server" version="12.0.21"/>
55-
<unit id="org.eclipse.jetty.websocket.server" version="12.0.21"/>
56-
<unit id="org.eclipse.jetty.ee9.servlet" version="12.0.21"/>
57-
<unit id="org.eclipse.jetty.ee9.server" version="12.0.21"/>
58-
<unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.0.21"/>
59-
<unit id="org.eclipse.jetty.alpn.client" version="12.0.21"/>
60-
<unit id="org.eclipse.jetty.websocket.core.client" version="12.0.21"/>
52+
<unit id="org.eclipse.jetty.websocket.api" version="12.1.0"/>
53+
<unit id="org.eclipse.jetty.ee9.websocket.api" version="12.1.0"/>
54+
<unit id="org.eclipse.jetty.ee9.websocket.server" version="12.1.0"/>
55+
<unit id="org.eclipse.jetty.websocket.server" version="12.1.0"/>
56+
<unit id="org.eclipse.jetty.ee9.servlet" version="12.1.0"/>
57+
<unit id="org.eclipse.jetty.ee9.server" version="12.1.0"/>
58+
<unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.1.0"/>
59+
<unit id="org.eclipse.jetty.alpn.client" version="12.1.0"/>
60+
<unit id="org.eclipse.jetty.websocket.core.client" version="12.1.0"/>
6161
<unit id="org.eclipse.jetty.servlet-api" version="5.0.2"/>
6262
<unit id="jakarta.annotation-api" version="3.0.0"/>
6363
<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>

‎releng/platform-definitions/platform-definition-2025-03/platform-definition-2025-03.target‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@
4949
<unit id="org.jolokia.service.discovery" version="2.0.2"/>
5050
<unit id="org.jolokia.server.core" version="2.0.2"/>
5151
<unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
52-
<unit id="org.eclipse.jetty.websocket.api" version="12.0.21"/>
53-
<unit id="org.eclipse.jetty.ee9.websocket.api" version="12.0.21"/>
54-
<unit id="org.eclipse.jetty.ee9.websocket.server" version="12.0.21"/>
55-
<unit id="org.eclipse.jetty.websocket.server" version="12.0.21"/>
56-
<unit id="org.eclipse.jetty.ee9.servlet" version="12.0.21"/>
57-
<unit id="org.eclipse.jetty.ee9.server" version="12.0.21"/>
58-
<unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.0.21"/>
59-
<unit id="org.eclipse.jetty.alpn.client" version="12.0.21"/>
60-
<unit id="org.eclipse.jetty.websocket.core.client" version="12.0.21"/>
52+
<unit id="org.eclipse.jetty.websocket.api" version="12.1.0"/>
53+
<unit id="org.eclipse.jetty.ee9.websocket.api" version="12.1.0"/>
54+
<unit id="org.eclipse.jetty.ee9.websocket.server" version="12.1.0"/>
55+
<unit id="org.eclipse.jetty.websocket.server" version="12.1.0"/>
56+
<unit id="org.eclipse.jetty.ee9.servlet" version="12.1.0"/>
57+
<unit id="org.eclipse.jetty.ee9.server" version="12.1.0"/>
58+
<unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.1.0"/>
59+
<unit id="org.eclipse.jetty.alpn.client" version="12.1.0"/>
60+
<unit id="org.eclipse.jetty.websocket.core.client" version="12.1.0"/>
6161
<unit id="org.eclipse.jetty.servlet-api" version="5.0.2"/>
6262
<unit id="jakarta.annotation-api" version="3.0.0"/>
6363
<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>

‎releng/platform-definitions/platform-definition-2025-06/platform-definition-2025-06.target‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@
4949
<unit id="org.jolokia.service.discovery" version="2.0.2"/>
5050
<unit id="org.jolokia.server.core" version="2.0.2"/>
5151
<unit id="com.github.tomakehurst.wiremock-standalone" version="2.27.2"/>
52-
<unit id="org.eclipse.jetty.websocket.api" version="12.0.21"/>
53-
<unit id="org.eclipse.jetty.ee9.websocket.api" version="12.0.21"/>
54-
<unit id="org.eclipse.jetty.ee9.websocket.server" version="12.0.21"/>
55-
<unit id="org.eclipse.jetty.websocket.server" version="12.0.21"/>
56-
<unit id="org.eclipse.jetty.ee9.servlet" version="12.0.21"/>
57-
<unit id="org.eclipse.jetty.ee9.server" version="12.0.21"/>
58-
<unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.0.21"/>
59-
<unit id="org.eclipse.jetty.alpn.client" version="12.0.21"/>
60-
<unit id="org.eclipse.jetty.websocket.core.client" version="12.0.21"/>
52+
<unit id="org.eclipse.jetty.websocket.api" version="12.1.0"/>
53+
<unit id="org.eclipse.jetty.ee9.websocket.api" version="12.1.0"/>
54+
<unit id="org.eclipse.jetty.ee9.websocket.server" version="12.1.0"/>
55+
<unit id="org.eclipse.jetty.websocket.server" version="12.1.0"/>
56+
<unit id="org.eclipse.jetty.ee9.servlet" version="12.1.0"/>
57+
<unit id="org.eclipse.jetty.ee9.server" version="12.1.0"/>
58+
<unit id="org.eclipse.jetty.ee9.websocket.servlet" version="12.1.0"/>
59+
<unit id="org.eclipse.jetty.alpn.client" version="12.1.0"/>
60+
<unit id="org.eclipse.jetty.websocket.core.client" version="12.1.0"/>
6161
<unit id="org.eclipse.jetty.servlet-api" version="5.0.2"/>
6262
<unit id="jakarta.annotation-api" version="3.0.0"/>
6363
<unit id="org.apache.aries.spifly.dynamic.bundle" version="1.3.7"/>

0 commit comments

Comments
 (0)