This is an automated email from the ASF dual-hosted git repository.
tmysik 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 8ad656a [NETBEANS-5905] Don't check idekey for Xdebug
new 403d51b Merge pull request #3109 from
junichi11/netbeans-5905-debug-regardress-of-idekey
8ad656a is described below
commit 8ad656a56e0965a7e041d5d4ed4b4e67be539024
Author: Junichi Yamamoto <[email protected]>
AuthorDate: Tue Aug 17 09:00:09 2021 +0900
[NETBEANS-5905] Don't check idekey for Xdebug
https://issues.apache.org/jira/browse/NETBEANS-5905
See also https://bugs.xdebug.org/view.php?id=2005
---
php/php.dbgp/src/org/netbeans/modules/php/dbgp/DebugSession.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/php/php.dbgp/src/org/netbeans/modules/php/dbgp/DebugSession.java
b/php/php.dbgp/src/org/netbeans/modules/php/dbgp/DebugSession.java
index 8d3004b..bbc3db5 100644
--- a/php/php.dbgp/src/org/netbeans/modules/php/dbgp/DebugSession.java
+++ b/php/php.dbgp/src/org/netbeans/modules/php/dbgp/DebugSession.java
@@ -160,7 +160,9 @@ public class DebugSession extends SingleThread {
DebuggerEngine[] engines =
DebuggerManager.getDebuggerManager().getDebuggerEngines();
for (DebuggerEngine nextEngine : engines) {
SessionId id = (SessionId) nextEngine.lookupFirst(null,
SessionId.class);
- if (id != null && id.getId().equals(message.getSessionId())) {
+ // [NETBEANS-5905] don't check about what the idekey is
+ // see also https://bugs.xdebug.org/view.php?id=2005
+ if (id != null && message.getSessionId() != null) {
sessionId.set(id);
id.initialize(message.getFileUri(), options.getPathMapping());
engine.set(nextEngine);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
