Derby requires a publicly accessible stream creation method (SPR-6346)
This commit is contained in:
@@ -18,7 +18,6 @@ package org.springframework.jdbc.datasource.embedded;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
import java.sql.SQLException;
|
||||
import java.util.Properties;
|
||||
import javax.sql.DataSource;
|
||||
@@ -54,8 +53,8 @@ final class DerbyEmbeddedDatabaseConfigurer implements EmbeddedDatabaseConfigure
|
||||
public static synchronized DerbyEmbeddedDatabaseConfigurer getInstance() throws ClassNotFoundException {
|
||||
if (INSTANCE == null) {
|
||||
// disable log file
|
||||
System.setProperty("derby.stream.error.method",
|
||||
DerbyEmbeddedDatabaseConfigurer.class.getName() + ".getNoopOutputStream");
|
||||
System.setProperty("derby.stream.error.method",
|
||||
OutputStreamFactory.class.getName() + ".getNoopOutputStream");
|
||||
INSTANCE = new DerbyEmbeddedDatabaseConfigurer();
|
||||
}
|
||||
return INSTANCE;
|
||||
@@ -101,17 +100,4 @@ final class DerbyEmbeddedDatabaseConfigurer implements EmbeddedDatabaseConfigure
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Returns an {@link OutputStream} that ignores all data given to it.
|
||||
* Used by {@link #getInstance()} to prevent writing to Derby.log file.
|
||||
*/
|
||||
public static OutputStream getNoopOutputStream() {
|
||||
return new OutputStream() {
|
||||
public void write(int b) throws IOException {
|
||||
// ignore the output
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
/*
|
||||
* Copyright 2002-2009 the original author or authors.
|
||||
*
|
||||
* Licensed 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.springframework.jdbc.datasource.embedded;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
|
||||
/**
|
||||
* Internal helper for exposing dummy OutputStreams to embedded databases
|
||||
* such as Derby, preventing the creation of a log file.
|
||||
*
|
||||
* @author Juergen Hoeller
|
||||
* @since 3.0
|
||||
*/
|
||||
public class OutputStreamFactory {
|
||||
|
||||
/**
|
||||
* Returns an {@link java.io.OutputStream} that ignores all data given to it.
|
||||
*/
|
||||
public static OutputStream getNoopOutputStream() {
|
||||
return new OutputStream() {
|
||||
public void write(int b) throws IOException {
|
||||
// ignore the output
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user