You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2008/06/12 23:18:26 UTC
svn commit: r667230 - in
/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport:
base/BaseUtils.java mail/MailTransportListener.java
vfs/VFSTransportListener.java
Author: veithen
Date: Thu Jun 12 14:18:26 2008
New Revision: 667230
URL: http://svn.apache.org/viewvc?rev=667230&view=rev
Log:
Eliminated BaseUtils#isValid in favor of BaseUtils#isBlank because both methods do the same (modulo a logical negation) and the name "isBlank" has a clearer meaning than "isValid".
Modified:
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseUtils.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/mail/MailTransportListener.java
synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseUtils.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseUtils.java?rev=667230&r1=667229&r2=667230&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseUtils.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseUtils.java Thu Jun 12 14:18:26 2008
@@ -370,14 +370,10 @@
}
/**
- * Utility method to check if a string is not null and not empty
+ * Utility method to check if a string is null or empty
* @param str the string to check
- * @return true if not null and not empty
+ * @return true if the string is null or empty
*/
- public static boolean isValid(String str) {
- return (str != null && str.trim().length() > 0);
- }
-
public static boolean isBlank(String str) {
if (str == null || str.length() == 0) {
return true;
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/mail/MailTransportListener.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/mail/MailTransportListener.java?rev=667230&r1=667229&r2=667230&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/mail/MailTransportListener.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/mail/MailTransportListener.java Thu Jun 12 14:18:26 2008
@@ -279,7 +279,7 @@
// figure out content type of primary request. If the content type is specified, use it
String contentType = entry.getContentType();
- if (!BaseUtils.isValid(contentType)) {
+ if (BaseUtils.isBlank(contentType)) {
Object content = message.getContent();
if (content instanceof Multipart) {
Modified: synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java?rev=667230&r1=667229&r2=667230&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java (original)
+++ synapse/trunk/java/modules/transports/src/main/java/org/apache/synapse/transport/vfs/VFSTransportListener.java Thu Jun 12 14:18:26 2008
@@ -381,7 +381,7 @@
"_" + System.currentTimeMillis() + "_" + (int) Math.random() * 1000;
String contentType = entry.getContentType();
- if (!BaseUtils.isValid(contentType)) {
+ if (BaseUtils.isBlank(contentType)) {
if (file.getName().getExtension().toLowerCase().endsWith(".xml")) {
contentType = "text/xml";
} else if (file.getName().getExtension().toLowerCase().endsWith(".txt")) {