You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2018/04/25 10:09:54 UTC
[3/7] jena git commit: JENA-1531: start/finish request as part of
ActionBase.doCommon
JENA-1531: start/finish request as part of ActionBase.doCommon
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e931e19a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e931e19a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e931e19a
Branch: refs/heads/master
Commit: e931e19a76c7300c8fab34472215bcd19d2821ac
Parents: ee2f476
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Apr 21 21:14:27 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Apr 21 21:14:27 2018 +0100
----------------------------------------------------------------------
.../org/apache/jena/fuseki/mgt/ActionCtl.java | 11 +----
.../apache/jena/fuseki/servlets/ActionBase.java | 6 ++-
.../jena/fuseki/servlets/ActionService.java | 42 +++++++++-----------
.../apache/jena/fuseki/servlets/HttpAction.java | 3 +-
4 files changed, 25 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e931e19a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java
index 79aa9de..24d55dd 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java
@@ -64,15 +64,8 @@ public abstract class ActionCtl extends ActionBase {
// This is the service request lifecycle.
final
- protected void executeLifecycle(HttpAction action)
- {
- startRequest(action) ;
- try {
- perform(action) ;
- }
- finally {
- finishRequest(action) ;
- }
+ protected void executeLifecycle(HttpAction action) {
+ perform(action) ;
}
final
http://git-wip-us.apache.org/repos/asf/jena/blob/e931e19a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
index 367c12b..5bd52c1 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionBase.java
@@ -70,6 +70,7 @@ public abstract class ActionBase extends ServletBase
response = action.response ;
initResponse(request, response) ;
try {
+ action.startRequest();
execCommonWorker(action) ;
} catch (QueryCancelledException ex) {
// To put in the action timeout, need (1) global, (2) dataset and (3) protocol settings.
@@ -103,9 +104,10 @@ public abstract class ActionBase extends ServletBase
//ex.printStackTrace(System.err) ;
log.warn(format("[%d] RC = %d : %s", id, HttpSC.INTERNAL_SERVER_ERROR_500, ex.getMessage()), ex) ;
ServletOps.responseSendError(response, HttpSC.INTERNAL_SERVER_ERROR_500, ex.getMessage()) ;
+ } finally {
+ action.setFinishTime() ;
+ finishRequest(action);
}
-
- action.setFinishTime() ;
printResponse(action) ;
archiveHttpAction(action) ;
} catch (Throwable th) {
http://git-wip-us.apache.org/repos/asf/jena/blob/e931e19a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionService.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionService.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionService.java
index 230c5fd..79cc236 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionService.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ActionService.java
@@ -156,7 +156,6 @@ public abstract class ActionService extends ActionBase {
*/
// This is the service request lifecycle.
final protected void executeLifecycle(HttpAction action) {
- startRequest(action);
// And also HTTP counter
CounterSet csService = action.getDataService().getCounters();
CounterSet csOperation = null;
@@ -166,32 +165,27 @@ public abstract class ActionService extends ActionBase {
incCounter(csService, Requests);
incCounter(csOperation, Requests);
+ // Either exit this via "bad request" on validation
+ // or in execution in perform.
try {
- // Either exit this via "bad request" on validation
- // or in execution in perform.
- try {
- validate(action);
- }
- catch (ActionErrorException ex) {
- incCounter(csOperation, RequestsBad);
- incCounter(csService, RequestsBad);
- throw ex;
- }
+ validate(action);
+ }
+ catch (ActionErrorException ex) {
+ incCounter(csOperation, RequestsBad);
+ incCounter(csService, RequestsBad);
+ throw ex;
+ }
- try {
- perform(action);
- // Success
- incCounter(csOperation, RequestsGood);
- incCounter(csService, RequestsGood);
- }
- catch (ActionErrorException | QueryCancelledException | RuntimeIOException ex) {
- incCounter(csOperation, RequestsBad);
- incCounter(csService, RequestsBad);
- throw ex;
- }
+ try {
+ perform(action);
+ // Success
+ incCounter(csOperation, RequestsGood);
+ incCounter(csService, RequestsGood);
}
- finally {
- finishRequest(action);
+ catch (ActionErrorException | QueryCancelledException | RuntimeIOException ex) {
+ incCounter(csOperation, RequestsBad);
+ incCounter(csService, RequestsBad);
+ throw ex;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/e931e19a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
index 4052f2d..79a6a5f 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
@@ -324,8 +324,7 @@ public class HttpAction
activeDSG = null ;
}
- public final void startRequest()
- {
+ public final void startRequest() {
if ( dataAccessPoint != null )
dataAccessPoint.startRequest(this) ;
}