This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 107765
Collapse All | Expand All

(-)javacvs-orig/libsrc/org/netbeans/lib/cvsclient/response/MergedResponse.java (-1 / +1 lines)
Lines 48-54 Link Here
48
            throws ResponseException {
48
            throws ResponseException {
49
        super.process(dis, services);
49
        super.process(dis, services);
50
        EventManager manager = services.getEventManager();
50
        EventManager manager = services.getEventManager();
51
        if (manager.isFireEnhancedEventSet()) {
51
        if (manager.isFireEnhancedEventSet() && localFile != null) {
52
            manager.fireCVSEvent(new EnhancedMessageEvent(this, EnhancedMessageEvent.MERGED_PATH, localFile));
52
            manager.fireCVSEvent(new EnhancedMessageEvent(this, EnhancedMessageEvent.MERGED_PATH, localFile));
53
        }
53
        }
54
    }
54
    }
(-)javacvs-orig/libsrc/org/netbeans/lib/cvsclient/response/UpdatedResponse.java (-1 / +2 lines)
Lines 127-132 Link Here
127
            }
127
            }
128
            
128
            
129
            localFile = newFile.getAbsolutePath();
129
            localFile = newFile.getAbsolutePath();
130
            boolean fileExists = newFile.exists();
130
            final Entry entry = new Entry(entryLine);
131
            final Entry entry = new Entry(entryLine);
131
132
132
            FileHandler fileHandler = useGzip ? services.getGzipFileHandler()
133
            FileHandler fileHandler = useGzip ? services.getGzipFileHandler()
Lines 170-176 Link Here
170
            services.updateAdminData(localPath, repositoryPath, entry);
171
            services.updateAdminData(localPath, repositoryPath, entry);
171
172
172
            // now fire the appropriate event
173
            // now fire the appropriate event
173
            if (newFile.exists()) {
174
            if (! fileExists) {
174
                FileAddedEvent e = new FileAddedEvent(this, filePath);
175
                FileAddedEvent e = new FileAddedEvent(this, filePath);
175
                services.getEventManager().fireCVSEvent(e);
176
                services.getEventManager().fireCVSEvent(e);
176
            }
177
            }

Return to bug 107765