summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-01-24 16:49:15 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2018-01-24 16:49:15 +0100
commitdcbc09c41ffadeb7ae063717aae979700205d30b (patch)
tree2095c5634d6992241ed3c415e1b44463d45ae567
parent8c6cba39fa75a4078e458f9ffbb96699067fcc84 (diff)
Proper indentation.
-rwxr-xr-xvespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java73
1 files changed, 37 insertions, 36 deletions
diff --git a/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java b/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java
index 8fda21e2494..cf29814bef3 100755
--- a/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java
@@ -74,44 +74,45 @@ public final class VespaFeedHandler extends VespaFeedHandlerBase {
try {
int busy = busyThreads.incrementAndGet();
if (busy > maxBusyThreads) {
- log.warning("too many threads ["+busy+"] busy, returning SERVICE UNAVAILABLE");
+ log.warning("too many threads [" + busy + "] busy, returning SERVICE UNAVAILABLE");
return new EmptyResponse(com.yahoo.jdisc.http.HttpResponse.Status.SERVICE_UNAVAILABLE);
}
- boolean asynchronous = request.getBooleanProperty("asynchronous");
-
- MessagePropertyProcessor.PropertySetter properties = getPropertyProcessor().buildPropertySetter(request);
-
- String route = properties.getRoute().toString();
- FeedResponse response = new FeedResponse(new RouteMetricSet(route, callback));
-
- SingleSender sender = new SingleSender(response, getSharedSender(route), !asynchronous);
- sender.addMessageProcessor(properties);
- sender.addMessageProcessor(new DocprocMessageProcessor(getDocprocChain(request), getDocprocServiceRegistry(request)));
-
- Feeder feeder = createFeeder(sender, request);
- feeder.setAbortOnDocumentError(properties.getAbortOnDocumentError());
- feeder.setCreateIfNonExistent(properties.getCreateIfNonExistent());
- response.setAbortOnFeedError(properties.getAbortOnFeedError());
-
- List<String> errors = feeder.parse();
- for (String s : errors) {
- response.addXMLParseError(s);
- }
- if (errors.size() > 0 && feeder instanceof XMLFeeder) {
- response.addXMLParseError("If you are trying to feed JSON, set the Content-Type header to application/json.");
- }
-
- sender.done();
-
- if (asynchronous) {
- return response;
- }
- long millis = getTimeoutMillis(request);
- boolean completed = sender.waitForPending(millis);
- if ( ! completed)
- response.addError("Timed out after "+millis+" ms waiting for responses");
- response.done();
- return response;
+ boolean asynchronous = request.getBooleanProperty("asynchronous");
+
+ MessagePropertyProcessor.PropertySetter properties = getPropertyProcessor().buildPropertySetter(request);
+
+ String route = properties.getRoute().toString();
+ FeedResponse response = new FeedResponse(new RouteMetricSet(route, callback));
+
+ SingleSender sender = new SingleSender(response, getSharedSender(route), !asynchronous);
+ sender.addMessageProcessor(properties);
+ sender.addMessageProcessor(new DocprocMessageProcessor(getDocprocChain(request), getDocprocServiceRegistry(request)));
+
+ Feeder feeder = createFeeder(sender, request);
+ feeder.setAbortOnDocumentError(properties.getAbortOnDocumentError());
+ feeder.setCreateIfNonExistent(properties.getCreateIfNonExistent());
+ response.setAbortOnFeedError(properties.getAbortOnFeedError());
+
+ List<String> errors = feeder.parse();
+ for (String s : errors) {
+ response.addXMLParseError(s);
+ }
+ if (errors.size() > 0 && feeder instanceof XMLFeeder) {
+ response.addXMLParseError("If you are trying to feed JSON, set the Content-Type header to application/json.");
+ }
+
+ sender.done();
+
+ if (asynchronous) {
+ return response;
+ }
+ long millis = getTimeoutMillis(request);
+ boolean completed = sender.waitForPending(millis);
+ if (!completed) {
+ response.addError("Timed out after " + millis + " ms waiting for responses");
+ }
+ response.done();
+ return response;
} finally {
busyThreads.decrementAndGet();
}