[Carbon-commits] [Carbon-Components] svn commit r67425 - in trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core: . boxcarring description/config description/query engine

anjana at wso2.com anjana at wso2.com
Tue Jun 1 02:11:52 PDT 2010


Author: anjana
Date: Tue Jun  1 02:11:52 2010
New Revision: 67425
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=67425

Log:
cleanup in code

Modified:
   trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/DBDeployer.java
   trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/FaultyServiceRectifier.java
   trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/boxcarring/TLConnectionStore.java
   trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/description/config/CSVConfig.java
   trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/description/config/ExcelConfig.java
   trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/description/config/SQLConfig.java
   trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/description/query/CSVQuery.java
   trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/engine/DataService.java

Modified: trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/DBDeployer.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/DBDeployer.java?rev=67425&r1=67424&r2=67425&view=diff
==============================================================================
--- trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/DBDeployer.java	(original)
+++ trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/DBDeployer.java	Tue Jun  1 02:11:52 2010
@@ -343,7 +343,7 @@
 				try {
 					fis.close();
 				} catch (IOException e) {
-					log.error(e);
+					log.error("Error in closing data service configuration file", e);
 				}
 			}
 		}

Modified: trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/FaultyServiceRectifier.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/FaultyServiceRectifier.java?rev=67425&r1=67424&r2=67425&view=diff
==============================================================================
--- trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/FaultyServiceRectifier.java	(original)
+++ trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/FaultyServiceRectifier.java	Tue Jun  1 02:11:52 2010
@@ -87,7 +87,7 @@
 				}
 			}
 		} catch (Exception e) {
-			log.error(e);
+			log.error("Error in faulty service rectifier", e);
 		} finally {
 			/* cancel timer */
 			this.cancel();

Modified: trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/boxcarring/TLConnectionStore.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/boxcarring/TLConnectionStore.java?rev=67425&r1=67424&r2=67425&view=diff
==============================================================================
--- trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/boxcarring/TLConnectionStore.java	(original)
+++ trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/boxcarring/TLConnectionStore.java	Tue Jun  1 02:11:52 2010
@@ -77,7 +77,7 @@
 						conn.close();
 					}
 				} catch (Exception e) {
-					log.error(e);
+					log.error("Error in rollbackAllAndClose", e);
 				}
 			}
 			conns.clear();

Modified: trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/description/config/CSVConfig.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/description/config/CSVConfig.java?rev=67425&r1=67424&r2=67425&view=diff
==============================================================================
--- trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/description/config/CSVConfig.java	(original)
+++ trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/description/config/CSVConfig.java	Tue Jun  1 02:11:52 2010
@@ -121,7 +121,7 @@
     			try {
     			    reader.close();
     			} catch (IOException e) {
-					log.error(e);
+					log.error("Error in closing CSV reader", e);
 				}
     		}
     	}
@@ -158,7 +158,7 @@
 			reader.close();
 			return true;
 		} catch (Exception e) {
-			log.error(e);
+			log.error("Error in checking CSV config availability", e);
 			return false;
 		}
 	}

Modified: trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/description/config/ExcelConfig.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/description/config/ExcelConfig.java?rev=67425&r1=67424&r2=67425&view=diff
==============================================================================
--- trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/description/config/ExcelConfig.java	(original)
+++ trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/description/config/ExcelConfig.java	Tue Jun  1 02:11:52 2010
@@ -63,7 +63,7 @@
 			Workbook wb = this.createWorkbook();
 			return wb != null;
 		} catch (Exception e) {
-			log.error(e);
+			log.error("Error in checking Excel config availability", e);
 			return false;
 		}
 	}

Modified: trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/description/config/SQLConfig.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/description/config/SQLConfig.java?rev=67425&r1=67424&r2=67425&view=diff
==============================================================================
--- trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/description/config/SQLConfig.java	(original)
+++ trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/description/config/SQLConfig.java	Tue Jun  1 02:11:52 2010
@@ -73,7 +73,7 @@
 			conn.close();
 			return true;
 		} catch (Exception e) {
-			log.error(e);
+			log.error("Error in checking SQL config availability", e);
 			return false;
 		}
 	}

Modified: trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/description/query/CSVQuery.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/description/query/CSVQuery.java?rev=67425&r1=67424&r2=67425&view=diff
==============================================================================
--- trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/description/query/CSVQuery.java	(original)
+++ trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/description/query/CSVQuery.java	Tue Jun  1 02:11:52 2010
@@ -93,7 +93,7 @@
 				try {
 				    reader.close();
 				} catch (Exception e) {
-					log.error(e);
+					log.error("Error in closing CSV reader", e);
 				}
 			}
 		}

Modified: trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/engine/DataService.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/engine/DataService.java?rev=67425&r1=67424&r2=67425&view=diff
==============================================================================
--- trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/engine/DataService.java	(original)
+++ trunk/carbon/components/data-services/org.wso2.carbon.dataservices.core/src/main/java/org/wso2/carbon/dataservices/core/engine/DataService.java	Tue Jun  1 02:11:52 2010
@@ -156,14 +156,15 @@
 	 */
 	public void init() {
 		/* init callable requests */
-		for (CallableRequest crs : this.getCallableRequests().values()) {
-			crs.getCallQueryGroup().init();
+		for (CallableRequest callableRequest : this.getCallableRequests().values()) {
+			callableRequest.getCallQueryGroup().init();
 		}
 		/* init queries */
 		for (Query query : this.getQueries().values()) {
 			if (query.hasResult()) {
-				for (CallQueryGroup cqg : query.getResult().getCallQueryGroupEntries()) {
-					cqg.init();
+				for (CallQueryGroup callQueryGroup : query.getResult().
+						getCallQueryGroupEntries()) {
+					callQueryGroup.init();
 				}
 			}
 		}
@@ -339,6 +340,11 @@
 	/**
 	 * Instructs the data service to run the request with the given name 
 	 * with the given parameters.
+	 * 
+	 * @param xmlWriter XMLStreamWriter used to write the result
+	 * @param requestName The service request name
+	 * @param params The parameters to be used for the service call
+	 * @throws DataServiceFault Thrown if a problem occurs in service dispatching
 	 */
 	public void invoke(XMLStreamWriter xmlWriter, String requestName, Map<String, 
 			ParamValue> params)	throws DataServiceFault {
@@ -437,7 +443,7 @@
 		try {
 		    this.initEventing(eventBrokerService);
 		} catch (DataServiceFault e) {
-			log.error(e);
+			log.error("Error in setting event broker service", e);
 		}
 	}
 	



More information about the Carbon-commits mailing list