Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

EL container integration; support for contextual objects; removal of deprecated Spring 2.0 functionality; Java 5 code style

Browse Source
This commit is contained in:
Juergen Hoeller
2008-11-20 02:10:53 +00:00
parent 369821dd66
commit 347f34c68a
281 changed files with 6120 additions and 9903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
org.springframework.context.support/src/main/java/org/springframework/mail/javamail/ConfigurableMimeFileTypeMap.java
View File

@@ -19,7 +19,6 @@ package org.springframework.mail.javamail;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import javax.activation.FileTypeMap;
import javax.activation.MimetypesFileTypeMap;
@@ -119,10 +118,8 @@ public class ConfigurableMimeFileTypeMap extends FileTypeMap implements Initiali
this.fileTypeMap = createFileTypeMap(this.mappingLocation, this.mappings);
}
catch (IOException ex) {
IllegalStateException ise = new IllegalStateException(
"Could not load specified MIME type mapping file: " + this.mappingLocation);
ise.initCause(ex);
throw ise;
throw new IllegalStateException(
"Could not load specified MIME type mapping file: " + this.mappingLocation, ex);
}
}
return this.fileTypeMap;

20
org.springframework.context.support/src/main/java/org/springframework/scheduling/quartz/SchedulerFactoryBean.java
View File

@@ -95,13 +95,17 @@ public class SchedulerFactoryBean extends SchedulerAccessor
public static final int DEFAULT_THREAD_COUNT = 10;
private static final ThreadLocal configTimeResourceLoaderHolder = new ThreadLocal();
private static final ThreadLocal<ResourceLoader> configTimeResourceLoaderHolder =
new ThreadLocal<ResourceLoader>();
private static final ThreadLocal configTimeTaskExecutorHolder = new ThreadLocal();
private static final ThreadLocal<TaskExecutor> configTimeTaskExecutorHolder =
new ThreadLocal<TaskExecutor>();
private static final ThreadLocal configTimeDataSourceHolder = new ThreadLocal();
private static final ThreadLocal<DataSource> configTimeDataSourceHolder =
new ThreadLocal<DataSource>();
private static final ThreadLocal configTimeNonTransactionalDataSourceHolder = new ThreadLocal();
private static final ThreadLocal<DataSource> configTimeNonTransactionalDataSourceHolder =
new ThreadLocal<DataSource>();
/**
* Return the ResourceLoader for the currently configured Quartz Scheduler,
@@ -113,7 +117,7 @@ public class SchedulerFactoryBean extends SchedulerAccessor
* @see ResourceLoaderClassLoadHelper
*/
public static ResourceLoader getConfigTimeResourceLoader() {
return (ResourceLoader) configTimeResourceLoaderHolder.get();
return configTimeResourceLoaderHolder.get();
}
/**
@@ -126,7 +130,7 @@ public class SchedulerFactoryBean extends SchedulerAccessor
* @see LocalTaskExecutorThreadPool
*/
public static TaskExecutor getConfigTimeTaskExecutor() {
return (TaskExecutor) configTimeTaskExecutorHolder.get();
return configTimeTaskExecutorHolder.get();
}
/**
@@ -139,7 +143,7 @@ public class SchedulerFactoryBean extends SchedulerAccessor
* @see LocalDataSourceJobStore
*/
public static DataSource getConfigTimeDataSource() {
return (DataSource) configTimeDataSourceHolder.get();
return configTimeDataSourceHolder.get();
}
/**
@@ -152,7 +156,7 @@ public class SchedulerFactoryBean extends SchedulerAccessor
* @see LocalDataSourceJobStore
*/
public static DataSource getConfigTimeNonTransactionalDataSource() {
return (DataSource) configTimeNonTransactionalDataSourceHolder.get();
return configTimeNonTransactionalDataSourceHolder.get();
}