|
1 | 1 | /*
|
2 |
| - * Copyright 2002-2012 the original author or authors. |
| 2 | + * Copyright 2002-2016 the original author or authors. |
3 | 3 | *
|
4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License");
|
5 | 5 | * you may not use this file except in compliance with the License.
|
|
16 | 16 |
|
17 | 17 | package org.springframework.scheduling.quartz;
|
18 | 18 |
|
19 |
| -import java.io.FileNotFoundException; |
20 | 19 | import java.io.IOException;
|
21 | 20 | import java.io.InputStream;
|
22 | 21 | import java.net.URL;
|
@@ -82,32 +81,41 @@ public <T> Class<? extends T> loadClass(String name, Class<T> clazz) throws Clas
|
82 | 81 |
|
83 | 82 | public URL getResource(String name) {
|
84 | 83 | Resource resource = this.resourceLoader.getResource(name);
|
85 |
| - try { |
86 |
| - return resource.getURL(); |
87 |
| - } |
88 |
| - catch (FileNotFoundException ex) { |
89 |
| - return null; |
| 84 | + if (resource.exists()) { |
| 85 | + try { |
| 86 | + return resource.getURL(); |
| 87 | + } |
| 88 | + catch (IOException ex) { |
| 89 | + if (logger.isWarnEnabled()) { |
| 90 | + logger.warn("Could not load " + resource); |
| 91 | + } |
| 92 | + return null; |
| 93 | + } |
90 | 94 | }
|
91 |
| - catch (IOException ex) { |
92 |
| - logger.warn("Could not load " + resource); |
93 |
| - return null; |
| 95 | + else { |
| 96 | + return getClassLoader().getResource(name); |
94 | 97 | }
|
95 | 98 | }
|
96 | 99 |
|
97 | 100 | public InputStream getResourceAsStream(String name) {
|
98 | 101 | Resource resource = this.resourceLoader.getResource(name);
|
99 |
| - try { |
100 |
| - return resource.getInputStream(); |
101 |
| - } |
102 |
| - catch (FileNotFoundException ex) { |
103 |
| - return null; |
| 102 | + if (resource.exists()) { |
| 103 | + try { |
| 104 | + return resource.getInputStream(); |
| 105 | + } |
| 106 | + catch (IOException ex) { |
| 107 | + if (logger.isWarnEnabled()) { |
| 108 | + logger.warn("Could not load " + resource); |
| 109 | + } |
| 110 | + return null; |
| 111 | + } |
104 | 112 | }
|
105 |
| - catch (IOException ex) { |
106 |
| - logger.warn("Could not load " + resource); |
107 |
| - return null; |
| 113 | + else { |
| 114 | + return getClassLoader().getResourceAsStream(name); |
108 | 115 | }
|
109 | 116 | }
|
110 | 117 |
|
| 118 | + @Override |
111 | 119 | public ClassLoader getClassLoader() {
|
112 | 120 | return this.resourceLoader.getClassLoader();
|
113 | 121 | }
|
|
0 commit comments