* the file and its delivery data as well as to attempt delivery.
*/
public class DeliveryTask implements Runnable, Comparable<DeliveryTask> {
- private static Logger logger = Logger.getLogger("org.onap.dmaap.datarouter.node.DeliveryTask");
+ private static Logger loggerDeliveryTask = Logger.getLogger("org.onap.dmaap.datarouter.node.DeliveryTask");
private DeliveryTaskHelper dth;
private String pubid;
private DestInfo di;
private int attempts;
private String[][] hdrs;
- /**
- * Is the object a DeliveryTask with the same publication ID?
- */
- public boolean equals(Object o) {
- if (!(o instanceof DeliveryTask)) {
- return (false);
- }
- return (pubid.equals(((DeliveryTask) o).pubid));
- }
-
- /**
- * Compare the publication IDs.
- */
- public int compareTo(DeliveryTask o) {
- return (pubid.compareTo(o.pubid));
- }
-
- /**
- * Get the hash code of the publication ID.
- */
- public int hashCode() {
- return (pubid.hashCode());
- }
-
- /**
- * Return the publication ID.
- */
- public String toString() {
- return (pubid);
- }
/**
* Create a delivery task for a given delivery queue and pub ID
boolean monly = di.isMetaDataOnly();
date = Long.parseLong(pubid.substring(0, pubid.indexOf('.')));
Vector<String[]> hdrv = new Vector<String[]>();
- try {
- BufferedReader br = new BufferedReader(new FileReader(metafile));
+
+ try (BufferedReader br = new BufferedReader(new FileReader(metafile))) {
String s = br.readLine();
int i = s.indexOf('\t');
method = s.substring(0, i);
}
hdrv.add(new String[]{h, v});
}
- br.close();
} catch (Exception e) {
+ loggerDeliveryTask.error("Exception "+e.getStackTrace(),e);
}
hdrs = hdrv.toArray(new String[hdrv.size()][]);
url = dth.getDestURL(fileid);
}
+ /**
+ * Is the object a DeliveryTask with the same publication ID?
+ */
+ public boolean equals(Object o) {
+ if (!(o instanceof DeliveryTask)) {
+ return (false);
+ }
+ return (pubid.equals(((DeliveryTask) o).pubid));
+ }
+
+ /**
+ * Compare the publication IDs.
+ */
+ public int compareTo(DeliveryTask o) {
+ return (pubid.compareTo(o.pubid));
+ }
+ /**
+ * Get the hash code of the publication ID.
+ */
+ public int hashCode() {
+ return (pubid.hashCode());
+ }
+
+ /**
+ * Return the publication ID.
+ */
+ public String toString() {
+ return (pubid);
+ }
/**
* Get the publish ID
*/
} catch (ProtocolException pe) {
dth.reportDeliveryExtra(this, -1L);
// Rcvd error instead of 100-continue
+ loggerDeliveryTask.error("Exception "+pe.getStackTrace(),pe);
}
if (os != null) {
long sofar = 0;
- try {
+ try (InputStream is = new FileInputStream(datafile)) {
byte[] buf = new byte[1024 * 1024];
- InputStream is = new FileInputStream(datafile);
while (sofar < length) {
int i = buf.length;
if (sofar + i > length) {
sofar += i;
os.write(buf, 0, i);
}
- is.close();
os.close();
} catch (IOException ioe) {
dth.reportDeliveryExtra(this, sofar);
}
dth.reportStatus(this, rc, xpubid, rmsg);
} catch (Exception e) {
+ loggerDeliveryTask.error("Exception "+e.getStackTrace(),e);
dth.reportException(this, e);
}
}