Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 149970
Collapse All | Expand All

(-)src/org/eclipse/update/internal/jarprocessor/JarProcessor.java (-5 / +27 lines)
Lines 123-133 Link Here
123 
				if (replacements.containsKey(entry.getName())) {
 123 
				if (replacements.containsKey(entry.getName())) {
124 
					String name = (String) replacements.get(entry.getName());
 124 
					String name = (String) replacements.get(entry.getName());
125 
					replacement = new File(directory, name);
 125 
					replacement = new File(directory, name);
126 
					in = new BufferedInputStream(new FileInputStream(replacement));
 126 
					if (name != null) {
127 
					newEntry = new JarEntry(name);
 127 
						if (replacement.exists()) {
128 
				} else {
 128 
							try {
129 
					in = new BufferedInputStream(jar.getInputStream(entry));
 129 
								in = new BufferedInputStream(new FileInputStream(replacement));
130 
					newEntry = new JarEntry(entry.getName());
 130 
								newEntry = new JarEntry(name);
131 
							} catch (Exception e) {
132 
								if (verbose) {
133 
									e.printStackTrace();
134 
									System.out.println("Warning: Problem reading " +replacement.getPath() + ", using " + jar.getName() + File.separator + entry.getName()  + " instead.");
135 
								}
136 
							}
137 
						} else if (verbose) {
138 
							System.out.println("Warning: " + replacement.getPath() + " not found, using " + jar.getName() + File.separator + entry.getName() + " instead.");
139 
						}
140 
					}
141 
				}
142 
				if (newEntry == null) {
143 
					try {
144 
						in = new BufferedInputStream(jar.getInputStream(entry));
145 
						newEntry = new JarEntry(entry.getName());
146 
					} catch( Exception e ) {
147 
						if(verbose) {
148 
							e.printStackTrace();
149 
							System.out.println("ERROR: problem reading " + entry.getName() + " from " + jar.getName());
150 
						}
151 
						continue;
152 
					}
131 
				}
 153 
				}
132 
				newEntry.setTime(entry.getTime());
 154 
				newEntry.setTime(entry.getTime());
133 
				outputJar.putNextEntry(newEntry);
 155 
				outputJar.putNextEntry(newEntry);

Return to bug 149970