Author: sebb
Date: Thu Jan 30 18:17:11 2014
New Revision: 1562912
URL: http://svn.apache.org/r1562912
Log:
Revert temporary hack
Add direct test to ensure Utils class loads OK
Added:
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestUtils.java
(with props)
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/Utils.java
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/Utils.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/Utils.java?rev=1562912&r1=1562911&r2=1562912&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/Utils.java
(original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/Utils.java Thu
Jan 30 18:17:11 2014
@@ -29,19 +29,8 @@ import java.util.ResourceBundle;
*/
public class Utils {
- private static final ResourceBundle messages;
- // Temporary hack to try and debu Continuum failure
- static {
- ResourceBundle msgs;
- try {
- msgs = ResourceBundle.getBundle(
- Utils.class.getPackage().getName() + ".LocalStrings");
- } catch (Exception e) {
- msgs = null;
- e.printStackTrace();
- }
- messages = msgs;
- }
+ private static final ResourceBundle messages = ResourceBundle.getBundle(
+ Utils.class.getPackage().getName() + ".LocalStrings");
private Utils() {
// not instantiable
Added:
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestUtils.java?rev=1562912&view=auto
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestUtils.java
(added)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestUtils.java
Thu Jan 30 18:17:11 2014
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.dbcp2;
+
+import java.sql.Connection;
+
+import junit.framework.TestCase;
+
+public class TestUtils extends TestCase {
+ public TestUtils(String testName) {
+ super(testName);
+ }
+
+ public void testClassLoads() {
+ Utils.closeQuietly((Connection) null);
+ }
+}
Propchange:
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TestUtils.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
