You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ga...@apache.org on 2008/12/10 21:24:21 UTC
svn commit: r725415 -
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
Author: gawor
Date: Wed Dec 10 12:24:20 2008
New Revision: 725415
URL: http://svn.apache.org/viewvc?rev=725415&view=rev
Log:
fix formatting and use of logical 'and' operator
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java?rev=725415&r1=725414&r2=725415&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/engine/AxisConfiguration.java Wed Dec 10 12:24:20 2008
@@ -678,38 +678,38 @@
* @return the configured message builder implementation class name against
* the given content type.
*/
- public Builder getMessageBuilder(String contentType) {
- Builder builder = null;
- if (messageBuilders.isEmpty()) {
- return null;
- }
- if (contentType != null) {
- builder = (Builder) messageBuilders.get(contentType);
- if (builder == null) {
- builder = (Builder) messageBuilders.get(contentType
- .toLowerCase());
- }
- if (builder == null) {
- Iterator<Entry<String, Builder>> iterator = messageBuilders.entrySet().iterator();
- while (iterator.hasNext() && builder == null) {
- Entry<String, Builder> entry = iterator.next();
- String key = entry.getKey();
- if (contentType.matches(key)) {
- builder = entry.getValue();
- }
- }
- }
- }
- return builder;
- }
+ public Builder getMessageBuilder(String contentType) {
+ Builder builder = null;
+ if (messageBuilders.isEmpty()) {
+ return null;
+ }
+ if (contentType != null) {
+ builder = (Builder) messageBuilders.get(contentType);
+ if (builder == null) {
+ builder = (Builder) messageBuilders.get(contentType.toLowerCase());
+ }
+ if (builder == null) {
+ Iterator<Entry<String, Builder>> iterator = messageBuilders.entrySet().iterator();
+ while (iterator.hasNext() && builder == null) {
+ Entry<String, Builder> entry = iterator.next();
+ String key = entry.getKey();
+ if (contentType.matches(key)) {
+ builder = entry.getValue();
+ }
+ }
+ }
+ }
+ return builder;
+ }
public Builder getMessageBuilder(String contentType, boolean defaultBuilder) {
- Builder builder = getMessageBuilder(contentType);
- if (builder ==null & defaultBuilder){
- builder = new UnknownContentBuilder();
- }
- return builder;
- }
+ Builder builder = getMessageBuilder(contentType);
+ if (builder == null && defaultBuilder){
+ builder = new UnknownContentBuilder();
+ }
+ return builder;
+ }
+
/**
* @param contentType
* @return the configured message formatter implementation class name