summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java58
1 files changed, 29 insertions, 29 deletions
diff --git a/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java b/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java
index 4a22874c..98b5b775 100644
--- a/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java
+++ b/bkucommon/src/main/java/at/gv/egiz/bku/binding/HTTPBindingProcessor.java
@@ -139,8 +139,8 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements
srcContex.setSourceIsDataURL(false);
}
- //----------------------------------------------------------------------------
- // ----------- BEGIN CONVENIENCE METHODS -----------
+ //----------------------------------------------------------------------------
+ // ----------- BEGIN CONVENIENCE METHODS -----------
protected void sendSTALQuit() {
log.info("Sending QUIT command to STAL");
@@ -217,24 +217,24 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements
}
}
- //----------------------------------------------------------------------------
- // ----------- END CONVENIENCE METHODS -----------
+ //----------------------------------------------------------------------------
+ // ----------- END CONVENIENCE METHODS -----------
- //----------------------------------------------------------------------------
- // -- BEGIN Methods that handle the http binding activities as defined in the
- // activity diagram --
+ //----------------------------------------------------------------------------
+ // -- BEGIN Methods that handle the http binding activities as defined in the
+ // activity diagram --
protected void init() {
log.info("Starting Bindingprocessor in Thread: "
+ Thread.currentThread().getId());
if (bindingProcessorError != null) {
log.debug("Detected binding processor error, sending quit command");
- // sendSTALQuit();
+ // sendSTALQuit();
currentState = State.FINISHED;
} else if (slCommand == null) {
log.error("SLCommand not set (consumeRequest not called ??)");
bindingProcessorError = new SLException(2000);
- // sendSTALQuit();
+ // sendSTALQuit();
currentState = State.FINISHED;
} else {
currentState = State.PROCESS;
@@ -270,7 +270,7 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements
DataUrl dataUrl = new DataUrl(getDataUrl());
DataUrlConnection conn = dataUrl.openConnection();
- // set transfer headers
+ // set transfer headers
for (FormParameter fp : getTransferHeaders()) {
String paramString = getFormParameterAsString(fp);
if (paramString == null) {
@@ -288,7 +288,7 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements
}
}
- // set transfer form parameters
+ // set transfer form parameters
for (FormParameter fp : getTransferForms()) {
String contentTransferEncoding = null;
String contentType = fp.getFormParameterContentType();
@@ -311,18 +311,18 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements
contentTransferEncoding);
}
- // connect
+ // connect
conn.connect();
- // fetch and set SL result
+ // fetch and set SL result
targetContext.setTargetIsDataURL(true);
targetContext.setTargetCertificate(conn.getServerCertificate());
targetContext.setTargetUrl(conn.getUrl());
SLResult result = commandInvoker.getResult(targetContext);
- // transfer result
+ // transfer result
conn.transmit(result);
- // process Dataurl response
+ // process Dataurl response
dataUrlResponse = conn.getResponse();
log.debug("Received data url response code: "
+ dataUrlResponse.getResponseCode());
@@ -335,7 +335,7 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements
if ((contentType.startsWith(HttpUtil.APPLICATION_URL_ENCODED))
|| (contentType.startsWith(HttpUtil.MULTIPART_FOTMDATA))) {
log.debug("Detected SL Request in dataurl response");
- // process headers and request
+ // process headers and request
setHTTPHeaders(dataUrlResponse.getResponseHeaders());
consumeRequestStream(dataUrlResponse.getStream());
closeDataUrlConnection();
@@ -363,7 +363,7 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements
srcContex.setSourceIsDataURL(true);
srcContex.setSourceUrl(conn.getUrl());
currentState = State.PROCESS;
- // just to be complete, actually not used
+ // just to be complete, actually not used
srcContex.setSourceHTTPReferer(dataUrlResponse.getResponseHeaders()
.get(HttpUtil.HTTP_HEADER_REFERER));
} else {
@@ -390,7 +390,7 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements
.error("Did not get a location header for a 307 data url response");
throw new SLBindingException(2003);
}
- // consumeRequestStream(dataUrlResponse.getStream());
+ // consumeRequestStream(dataUrlResponse.getStream());
FormParameterStore fp = new FormParameterStore();
fp.init(location.getBytes(HttpUtil.DEFAULT_CHARSET),
FixedFormParameters.DATAURL, null, null);
@@ -403,7 +403,7 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements
srcContex.setSourceIsDataURL(true);
srcContex.setSourceUrl(conn.getUrl());
currentState = State.PROCESS;
- // just to be complete, actually not used
+ // just to be complete, actually not used
srcContex.setSourceHTTPReferer(dataUrlResponse.getResponseHeaders()
.get(HttpUtil.HTTP_HEADER_REFERER));
@@ -427,7 +427,7 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements
break;
default:
- // issue error
+ // issue error
log.info("Unexpected response code from dataurl server: "
+ dataUrlResponse.getResponseCode());
throw new SLBindingException(2007);
@@ -499,9 +499,9 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements
finished = true;
}
- // -- END Methods that handle the http binding activities as defined in the
- // activity diagram --
- //----------------------------------------------------------------------------
+ // -- END Methods that handle the http binding activities as defined in the
+ // activity diagram --
+ //----------------------------------------------------------------------------
/**
* Sets the headers of the SL Request. IMPORTANT: make sure to set all headers
@@ -512,7 +512,7 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements
*/
public void setHTTPHeaders(Map<String, String> aHeaderMap) {
headerMap = new HashMap<String, String>();
- // ensure lowercase keys
+ // ensure lowercase keys
if (aHeaderMap != null) {
for (String s : aHeaderMap.keySet()) {
if (s != null) {
@@ -673,7 +673,7 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements
FormParameterStore fps = new FormParameterStore();
fps.init(fp);
if (!fps.isEmpty()) {
- log.debug("Setting from parameter: " + fps.getFormParameterName());
+ log.debug("Setting form parameter: " + fps.getFormParameterName());
formParameterMap.put(fps.getFormParameterName(), fps);
}
}
@@ -683,7 +683,7 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements
}
if (is.read() != -1) {
log.error("Request input stream not completely read");
- // consume rest of stream, should never occur
+ // consume rest of stream, should never occur
throw new SLRuntimeException(
"request input stream not consumed till end");
}
@@ -761,15 +761,15 @@ public class HTTPBindingProcessor extends AbstractBindingProcessor implements
transformer.transform(new StreamSource(isr), new StreamResult(osw));
} catch (TransformerException e) {
log.fatal("Exception occured during result transformation", e);
- // bindingProcessorError = new SLException(2008);
- // handleBindingProcessorError(os, encoding, null);
+ // bindingProcessorError = new SLException(2008);
+ // handleBindingProcessorError(os, encoding, null);
return;
}
}
osw.flush();
isr.close();
} else if (slResult == null) {
- // result not yet assigned -> must be a cancel
+ // result not yet assigned -> must be a cancel
bindingProcessorError = new SLException(6001);
handleBindingProcessorError(os, encoding, templates);
return;