Code Review
/
dmaap
/
datarouter.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "DR AAF CADI integration"
[dmaap/datarouter.git]
/
datarouter-node
/
src
/
main
/
java
/
org
/
onap
/
dmaap
/
datarouter
/
node
/
DeliveryTask.java
diff --git
a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java
b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java
index
c085ebe
..
46c4667
100644
(file)
--- a/
datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java
+++ b/
datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryTask.java
@@
-64,6
+64,7
@@
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
private String feedid;
private String subid;
private int attempts;
private String feedid;
private String subid;
private int attempts;
+ private boolean followRedirects;
private String[][] hdrs;
private String newInvocationId;
private long resumeTime;
private String[][] hdrs;
private String newInvocationId;
private long resumeTime;
@@
-82,6
+83,7
@@
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
this.pubid = pubid;
destInfo = deliveryTaskHelper.getDestinationInfo();
subid = destInfo.getSubId();
this.pubid = pubid;
destInfo = deliveryTaskHelper.getDestinationInfo();
subid = destInfo.getSubId();
+ this.followRedirects = destInfo.isFollowRedirects();
feedid = destInfo.getLogData();
spool = destInfo.getSpool();
String dfn = spool + "/" + pubid;
feedid = destInfo.getLogData();
spool = destInfo.getSpool();
String dfn = spool + "/" + pubid;
@@
-127,7
+129,7
@@
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
hdrv.add(new String[]{h, v});
}
} catch (Exception e) {
hdrv.add(new String[]{h, v});
}
} catch (Exception e) {
- loggerDeliveryTask.error("Exception "+
e.getStackTrace(),
e);
+ loggerDeliveryTask.error("Exception "+
Arrays.toString(e.getStackTrace()),
e);
}
hdrs = hdrv.toArray(new String[hdrv.size()][]);
url = deliveryTaskHelper.getDestURL(fileid);
}
hdrs = hdrv.toArray(new String[hdrv.size()][]);
url = deliveryTaskHelper.getDestURL(fileid);
@@
-247,7
+249,7
@@
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
}
deliveryTaskHelper.reportStatus(this, rc, xpubid, rmsg);
} catch (Exception e) {
}
deliveryTaskHelper.reportStatus(this, rc, xpubid, rmsg);
} catch (Exception e) {
- loggerDeliveryTask.error("Exception " +
e.getStackTrace(
), e);
+ loggerDeliveryTask.error("Exception " +
Arrays.toString(e.getStackTrace()
), e);
deliveryTaskHelper.reportException(this, e);
}
}
deliveryTaskHelper.reportException(this, e);
}
}
@@
-326,7
+328,7
@@
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
} catch (ProtocolException pe) {
deliveryTaskHelper.reportDeliveryExtra(this, -1L);
// Rcvd error instead of 100-continue
} catch (ProtocolException pe) {
deliveryTaskHelper.reportDeliveryExtra(this, -1L);
// Rcvd error instead of 100-continue
- loggerDeliveryTask.error("Exception " +
pe.getStackTrace(
), pe);
+ loggerDeliveryTask.error("Exception " +
Arrays.toString(pe.getStackTrace()
), pe);
}
return outputStream;
}
}
return outputStream;
}
@@
-425,4
+427,11
@@
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
String getFeedId() {
return (feedid);
}
String getFeedId() {
return (feedid);
}
+
+ /**
+ * Get the followRedirects for this delivery task
+ */
+ public boolean getFollowRedirects() {
+ return(followRedirects);
+ }
}
}