This is an automated email from the ASF dual-hosted git repository.
lkishalmi 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 03b951b [NETBEANS-4410] Fixed NPE on Certain Gradle Test Executions.
03b951b is described below
commit 03b951b31c1fcfe3713b773542509457a05b1678
Author: Laszlo Kishalmi <[email protected]>
AuthorDate: Mon Jun 15 07:58:44 2020 -0700
[NETBEANS-4410] Fixed NPE on Certain Gradle Test Executions.
---
.../gradle/test/GradleTestProgressListener.java | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git
a/groovy/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestProgressListener.java
b/groovy/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestProgressListener.java
index 1261dd2..7e20b06 100644
---
a/groovy/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestProgressListener.java
+++
b/groovy/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestProgressListener.java
@@ -134,12 +134,18 @@ public final class GradleTestProgressListener implements
ProgressListener, Gradl
TestOutputDescriptor desc = evt.getDescriptor();
OperationDescriptor parent = desc.getParent();
CoreManager manager = getManager();
- if (manager != null) {
- manager.displayOutput(session, desc.getMessage(),
desc.getDestination().equals(Destination.StdErr));
- }
- if ((parent != null) && (parent instanceof
JvmTestOperationDescriptor)) {
- Testcase tc =
runningTests.get(getTestOpKey((JvmTestOperationDescriptor) parent));
- tc.addOutputLines(Arrays.asList(desc.getMessage().split("\\R")));
+ String msg = desc.getMessage();
+ if (msg != null && msg.endsWith("\n")) {
+ msg = msg.substring(0, msg.length() - 1);
+ if (manager != null) {
+ manager.displayOutput(session, msg,
desc.getDestination().equals(Destination.StdErr));
+ }
+ if ((parent != null) && (parent instanceof
JvmTestOperationDescriptor)) {
+ Testcase tc =
runningTests.get(getTestOpKey((JvmTestOperationDescriptor) parent));
+ if (tc != null) {
+ tc.addOutputLines(Arrays.asList(msg.split("\\R")));
+ }
+ }
}
}
---------------------------------------------------------------------
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
