|
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;
|
@@ -73,43 +72,50 @@ public void initialize() {
|
73 | 72 | }
|
74 | 73 |
|
75 | 74 | @Override
|
76 |
| - @SuppressWarnings("rawtypes") |
77 |
| - public Class loadClass(String name) throws ClassNotFoundException { |
| 75 | + public Class<?> loadClass(String name) throws ClassNotFoundException { |
78 | 76 | return this.resourceLoader.getClassLoader().loadClass(name);
|
79 | 77 | }
|
80 | 78 |
|
81 | 79 | @SuppressWarnings("unchecked")
|
82 | 80 | public <T> Class<? extends T> loadClass(String name, Class<T> clazz) throws ClassNotFoundException {
|
83 |
| - return loadClass(name); |
| 81 | + return (Class<? extends T>) loadClass(name); |
84 | 82 | }
|
85 | 83 |
|
86 | 84 | @Override
|
87 | 85 | public URL getResource(String name) {
|
88 | 86 | Resource resource = this.resourceLoader.getResource(name);
|
89 |
| - try { |
90 |
| - return resource.getURL(); |
91 |
| - } |
92 |
| - catch (FileNotFoundException ex) { |
93 |
| - return null; |
| 87 | + if (resource.exists()) { |
| 88 | + try { |
| 89 | + return resource.getURL(); |
| 90 | + } |
| 91 | + catch (IOException ex) { |
| 92 | + if (logger.isWarnEnabled()) { |
| 93 | + logger.warn("Could not load " + resource); |
| 94 | + } |
| 95 | + return null; |
| 96 | + } |
94 | 97 | }
|
95 |
| - catch (IOException ex) { |
96 |
| - logger.warn("Could not load " + resource); |
97 |
| - return null; |
| 98 | + else { |
| 99 | + return getClassLoader().getResource(name); |
98 | 100 | }
|
99 | 101 | }
|
100 | 102 |
|
101 | 103 | @Override
|
102 | 104 | public InputStream getResourceAsStream(String name) {
|
103 | 105 | Resource resource = this.resourceLoader.getResource(name);
|
104 |
| - try { |
105 |
| - return resource.getInputStream(); |
106 |
| - } |
107 |
| - catch (FileNotFoundException ex) { |
108 |
| - return null; |
| 106 | + if (resource.exists()) { |
| 107 | + try { |
| 108 | + return resource.getInputStream(); |
| 109 | + } |
| 110 | + catch (IOException ex) { |
| 111 | + if (logger.isWarnEnabled()) { |
| 112 | + logger.warn("Could not load " + resource); |
| 113 | + } |
| 114 | + return null; |
| 115 | + } |
109 | 116 | }
|
110 |
| - catch (IOException ex) { |
111 |
| - logger.warn("Could not load " + resource); |
112 |
| - return null; |
| 117 | + else { |
| 118 | + return getClassLoader().getResourceAsStream(name); |
113 | 119 | }
|
114 | 120 | }
|
115 | 121 |
|
|
0 commit comments