Author: chinthaka
Date: Wed Sep 6 12:47:27 2006
New Revision: 440849
URL: http://svn.apache.org/viewvc?view=rev&rev=440849
Log:
More improvements to the quality of the code
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/attachments/Attachments.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/attachments/BoundaryDelimitedStream.java
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/attachments/Attachments.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/attachments/Attachments.java?view=diff&rev=440849&r1=440848&r2=440849
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/attachments/Attachments.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/attachments/Attachments.java
Wed Sep 6 12:47:27 2006
@@ -16,6 +16,15 @@
package org.apache.axiom.attachments;
+import org.apache.axiom.om.OMException;
+import org.apache.axiom.om.impl.MTOMConstants;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.activation.DataHandler;
+import javax.mail.MessagingException;
+import javax.mail.internet.ContentType;
+import javax.mail.internet.ParseException;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -23,16 +32,6 @@
import java.util.HashMap;
import java.util.Set;
-import javax.activation.DataHandler;
-import javax.mail.MessagingException;
-import javax.mail.internet.ContentType;
-import javax.mail.internet.ParseException;
-
-import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.impl.MTOMConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
public class Attachments {
/**
@@ -238,7 +237,7 @@
}
rootContentID = firstPartId;
} else {
- rootContentID.trim();
+ rootContentID = rootContentID.trim();
if ((rootContentID.indexOf("<") > -1)
& (rootContentID.indexOf(">") > -1)) {
@@ -413,7 +412,7 @@
"Referenced MIME part not found.End of Stream reached.");
}
- Part part = null;
+ Part part;
try {
if (fileCacheEnable) {
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/attachments/BoundaryDelimitedStream.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/attachments/BoundaryDelimitedStream.java?view=diff&rev=440849&r1=440848&r2=440849
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/attachments/BoundaryDelimitedStream.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/attachments/BoundaryDelimitedStream.java
Wed Sep 6 12:47:27 2006
@@ -75,7 +75,6 @@
/**
* Signal that a new stream has been created.
*
- * @return
*/
protected static synchronized int newStreamNo() {
@@ -186,7 +185,7 @@
System.arraycopy(boundary, 0, this.boundary, 0, boundary.length);
this.boundaryLen = this.boundary.length;
-
+
// 2 for preceeding, and 2 for proceeding CRLF's
this.boundaryBufLen = boundaryLen + 4;
@@ -212,7 +211,7 @@
int brTotal = 0;
do {
-
+
br = is.read(b, brTotal + start, length - brTotal);
if (br > 0) {
@@ -267,7 +266,7 @@
// read and copy bytes in.
do { // Always allow to have a boundary
length left in the buffer.
-
+
bwritten = 0;
int bcopy = Math.min(readBufEnd - readBufPos - boundaryBufLen,
len - bwritten);
@@ -287,7 +286,7 @@
log.debug("atEOS" + streamNo);
} else if (bwritten < len) { // need to get more data.
-
+
byte[] dstbuf = readbuf;
if (readbuf.length < len) {
@@ -397,7 +396,7 @@
// Easy way to flush through the stream;
byte[] readrest = new byte[1024 * 16];
- int bread = 0;
+ int bread;
do {
bread = read(readrest);
@@ -430,7 +429,6 @@
* markSupported
* return false;
*
- * @return
*/
public boolean markSupported() {
return false;
@@ -476,14 +474,14 @@
// If there really was no crlf at then end then this is
not a boundary.
foundAt = BOUNDARY_NOT_FOUND;
}
-
- if ((foundAt != BOUNDARY_NOT_FOUND)
+
+ if ((foundAt != BOUNDARY_NOT_FOUND)
&& (searchbuf[foundAt - 2] == 13)
&& (searchbuf[foundAt - 1] == 10)) {
- // Section 7.2.1 of the MIME RFC (#1521) states that
CRLF
- // preceeding boundary is part of the encapsulation
- // boundary
+ // Section 7.2.1 of the MIME RFC (#1521) states that
CRLF
+ // preceeding boundary is part of the encapsulation
+ // boundary
foundAt -= 2;
}
}
@@ -528,16 +526,14 @@
}
} catch (ArrayIndexOutOfBoundsException e) {
StringBuffer sb = new StringBuffer();
- sb.append(
- ">>>"
- + e); // rr temporary till a boundary issue is
resolved.
- sb.append("start=" + start);
- sb.append("k=" + k);
- sb.append("text.length=" + text.length);
- sb.append("i=" + i);
- sb.append("boundary.length=" + boundary.length);
- sb.append("j=" + j);
- sb.append("end=" + end);
+ sb.append(">>>").append(e); // rr temporary till a boundary
issue is resolved.
+ sb.append("start=").append(start);
+ sb.append("k=").append(k);
+ sb.append("text.length=").append(text.length);
+ sb.append("i=").append(i);
+ sb.append("boundary.length=").append(boundary.length);
+ sb.append("j=").append(j);
+ sb.append("end=").append(end);
log.warn("exception01" + sb.toString());
throw e;
}
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java?view=diff&rev=440849&r1=440848&r2=440849
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java
Wed Sep 6 12:47:27 2006
@@ -162,7 +162,7 @@
* @throws OMException
*/
protected OMNode createOMText(int textType) throws OMException {
- OMNode node = null;
+ OMNode node;
if (lastNode == null) {
return null;
} else if (!lastNode.isComplete()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
