Author: indika Date: Sun Nov 16 04:00:09 2008 New Revision: 24006 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=24006
Log: init some variables with default values fix some issues in ds fatory and serializer Modified: branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java Modified: branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java?rev=24006&r1=24005&r2=24006&view=diff ============================================================================== --- branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java (original) +++ branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/DataSourceInformation.java Sun Nov 16 04:00:09 2008 @@ -48,11 +48,11 @@ private int initialSize; private int defaultTransactionIsolation = -1; private String defaultCatalog; - private boolean accessToUnderlyingConnectionAllowed; - private boolean removeAbandoned; + private boolean accessToUnderlyingConnectionAllowed = false; + private boolean removeAbandoned = false; private long removeAbandonedTimeout; - private boolean logAbandoned; - private boolean poolPreparedStatements; + private boolean logAbandoned = true; + private boolean poolPreparedStatements = true; private int maxOpenPreparedStatements; private final Properties properties = new Properties(); private String repositoryType = DataSourceConfigurationConstants.PROP_REGISTRY_MEMORY; Modified: branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java?rev=24006&r1=24005&r2=24006&view=diff ============================================================================== --- branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java (original) +++ branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/factory/DataSourceInformationFactory.java Sun Nov 16 04:00:09 2008 @@ -85,13 +85,17 @@ // get other required properties String user = (String) MiscellaneousUtil.getProperty( - properties, prefix + DataSourceConfigurationConstants.PROP_USER_NAME, "synapse", String.class); - information.setUser(user); + properties, prefix + DataSourceConfigurationConstants.PROP_USER_NAME, null, String.class); + if (user != null && !"".equals(user)) { + information.setUser(user); + } String password = (String) MiscellaneousUtil.getProperty( - properties, prefix + DataSourceConfigurationConstants.PROP_PASSWORD, "synapse", String.class); + properties, prefix + DataSourceConfigurationConstants.PROP_PASSWORD, null, String.class); - information.setPassword(password); + if (password != null && !"".equals(password)) { + information.setPassword(password); + } String dataSourceName = (String) MiscellaneousUtil.getProperty( properties, prefix + DataSourceConfigurationConstants.PROP_DSNAME, dsName, String.class); Modified: branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java URL: http://wso2.org/svn/browse/wso2/branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java?rev=24006&r1=24005&r2=24006&view=diff ============================================================================== --- branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java (original) +++ branches/synapse/1.2.wso2v1/modules/utils/src/main/java/org/apache/synapse/commons/util/datasource/serializer/DataSourceInformationSerializer.java Sun Nov 16 04:00:09 2008 @@ -42,7 +42,7 @@ // Prefix for getting particular data source's properties String prefix = buffer.toString(); - addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_USER, + addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_USER_NAME, information.getUser()); addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_PASSWORD, information.getPassword()); @@ -84,8 +84,11 @@ addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_DEFAULTTRANSACTIONISOLATION, String.valueOf(information.getDefaultTransactionIsolation())); - addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_DEFAULTCATALOG, - String.valueOf(information.getDefaultCatalog())); + String defaultCatalog = information.getDefaultCatalog(); + if (defaultCatalog != null && !"".equals(defaultCatalog)) { + addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_DEFAULTCATALOG, + String.valueOf(defaultCatalog)); + } addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED, String.valueOf(information.isAccessToUnderlyingConnectionAllowed())); @@ -120,8 +123,11 @@ addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_TESTWHILEIDLE, String.valueOf(information.isTestWhileIdle())); - addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_VALIDATIONQUERY, - String.valueOf(information.getValidationQuery())); + String validationQ = information.getValidationQuery(); + if (validationQ != null && !"".equals(validationQ)) { + addProperty(properties, prefix + DataSourceConfigurationConstants.PROP_VALIDATIONQUERY, + String.valueOf(validationQ)); + } properties.putAll(information.getAllParameters()); properties.putAll(information.getProperties()); _______________________________________________ Esb-java-dev mailing list [email protected] http://mailman.wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
