You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/04/07 19:00:11 UTC
[1/4] incubator-nifi git commit: NIFI-486: Fixed NPE that occurs if
processor allows for controller service as optional property and no value set
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 7369730ce -> 39735c30b
NIFI-486: Fixed NPE that occurs if processor allows for controller service as optional property and no value set
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/50986932
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/50986932
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/50986932
Branch: refs/heads/develop
Commit: 50986932d6cdd0ffc7a8f0a828808bb72bb4fdf5
Parents: 4a16845
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon Apr 6 17:59:07 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon Apr 6 17:59:07 2015 -0400
----------------------------------------------------------------------
.../nifi/controller/scheduling/StandardProcessScheduler.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/50986932/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
index 89850cc..43e05dd 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
@@ -297,7 +297,9 @@ public final class StandardProcessScheduler implements ProcessScheduler {
final Class<? extends ControllerService> serviceDefinition = descriptor.getControllerServiceDefinition();
if ( serviceDefinition != null ) {
final String serviceId = processContext.getProperty(descriptor).getValue();
- serviceIds.add(serviceId);
+ if ( serviceId != null ) {
+ serviceIds.add(serviceId);
+ }
}
}
[2/4] incubator-nifi git commit: NIFI-490: If IO error when creating
Site-to-Site transaction, cleanup connection
Posted by ma...@apache.org.
NIFI-490: If IO error when creating Site-to-Site transaction, cleanup connection
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/a7862a19
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/a7862a19
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/a7862a19
Branch: refs/heads/develop
Commit: a7862a19ba56f4ce8350d34b38d7d4edc6002a66
Parents: 5098693
Author: Mark Payne <ma...@hotmail.com>
Authored: Tue Apr 7 12:36:35 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Tue Apr 7 12:36:35 2015 -0400
----------------------------------------------------------------------
.../org/apache/nifi/remote/client/socket/SocketClient.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a7862a19/nifi/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/socket/SocketClient.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/socket/SocketClient.java b/nifi/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/socket/SocketClient.java
index bd9319f..ed54ccb 100644
--- a/nifi/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/socket/SocketClient.java
+++ b/nifi/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/socket/SocketClient.java
@@ -130,8 +130,14 @@ public class SocketClient implements SiteToSiteClient {
return null;
}
- final Transaction transaction = connectionState.getSocketClientProtocol().startTransaction(
+ final Transaction transaction;
+ try {
+ transaction = connectionState.getSocketClientProtocol().startTransaction(
connectionState.getPeer(), connectionState.getCodec(), direction);
+ } catch (final Throwable t) {
+ pool.terminate(connectionState);
+ throw t;
+ }
// Wrap the transaction in a new one that will return the EndpointConnectionState back to the pool whenever
// the transaction is either completed or canceled.
[3/4] incubator-nifi git commit: NIFI-491: Fixed bug that caused
InvocationTargetException.getCause().getCause() instead of
InvocationTargetException.getCause();
also if null passed into logger, avoid the NPE that results
Posted by ma...@apache.org.
NIFI-491: Fixed bug that caused InvocationTargetException.getCause().getCause() instead of InvocationTargetException.getCause(); also if null passed into logger, avoid the NPE that results
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c974ea90
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c974ea90
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c974ea90
Branch: refs/heads/develop
Commit: c974ea90f89186bfd5f12e34f2cec3728d237b89
Parents: a7862a1
Author: Mark Payne <ma...@hotmail.com>
Authored: Tue Apr 7 12:41:31 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Tue Apr 7 12:41:31 2015 -0400
----------------------------------------------------------------------
.../nifi/controller/scheduling/StandardProcessScheduler.java | 4 ++--
.../main/java/org/apache/nifi/processor/SimpleProcessLogger.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c974ea90/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
index 43e05dd..7725823 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
@@ -339,8 +339,8 @@ public final class StandardProcessScheduler implements ProcessScheduler {
final ProcessorLog procLog = new SimpleProcessLogger(procNode.getIdentifier(), procNode.getProcessor());
procLog.error("{} failed to invoke @OnScheduled method due to {}; processor will not be scheduled to run for {}",
- new Object[]{procNode.getProcessor(), cause.getCause(), administrativeYieldDuration}, cause.getCause());
- LOG.error("Failed to invoke @OnScheduled method due to {}", cause.getCause().toString(), cause.getCause());
+ new Object[]{procNode.getProcessor(), cause, administrativeYieldDuration}, cause);
+ LOG.error("Failed to invoke @OnScheduled method due to {}", cause.toString(), cause);
ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnUnscheduled.class, procNode.getProcessor(), processContext);
ReflectionUtils.quietlyInvokeMethodsWithAnnotation(OnStopped.class, procNode.getProcessor(), processContext);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c974ea90/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
index 25d8f10..0a345a0 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
@@ -243,7 +243,7 @@ public class SimpleProcessLogger implements ProcessorLog {
for (int i = 0; i < os.length; i++) {
modifiedArgs[i + 1] = os[i];
}
- modifiedArgs[modifiedArgs.length - 1] = t.toString();
+ modifiedArgs[modifiedArgs.length - 1] = (t == null) ? "" : t.toString();
return modifiedArgs;
}
[4/4] incubator-nifi git commit: Merge branch 'develop' of
http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Posted by ma...@apache.org.
Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/39735c30
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/39735c30
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/39735c30
Branch: refs/heads/develop
Commit: 39735c30bcf2dccb090dd8c60a8668c27d9c7517
Parents: c974ea9 7369730
Author: Mark Payne <ma...@hotmail.com>
Authored: Tue Apr 7 12:46:48 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Tue Apr 7 12:46:48 2015 -0400
----------------------------------------------------------------------
.../service/StandardControllerServiceNode.java | 2 +-
.../js/jquery/propertytable/jquery.propertytable.js | 16 +++++++++++++++-
2 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------