Project

General

Profile

« Previous | Next » 

Revision 3230

Added by Jing Tao about 17 years ago

Somehow the change went to the head rather than branch. So i rollback the change in head.

View differences:

MetaCatServlet.java
1948 1948
                            accNumber = null;
1949 1949
                        }
1950 1950
                        newdocid = documentWrapper.write(dbConn, xml, pub, dtd,
1951
                                doAction, accNumber, user, groups, request.getRemoteAddr());
1951
                                doAction, accNumber, user, groups);
1952 1952
                        EventLog.getInstance().log(request.getRemoteAddr(),
1953 1953
                                user, accNumber, action[0]);
1954 1954
                    } catch (NullPointerException npe) {
1955 1955
                        newdocid = documentWrapper.write(dbConn, xml, pub, dtd,
1956
                                doAction, null, user, groups, request.getRemoteAddr());
1956
                                doAction, null, user, groups);
1957 1957
                        EventLog.getInstance().log(request.getRemoteAddr(),
1958 1958
                                user, "", action[0]);
1959 1959
                    }
......
2262 2262

  
2263 2263
                try {
2264 2264
                    // null means notify server is null
2265
                    DocumentImpl.delete(docid[0], user, groups, null, request.getRemoteAddr());
2265
                    DocumentImpl.delete(docid[0], user, groups, null);
2266 2266
                    EventLog.getInstance().log(request.getRemoteAddr(),
2267 2267
                                               user, docid[0], "delete");
2268 2268
                    response.setContentType("text/xml");
......
2956 2956
                        // original command,
2957 2957
                        // not get force replication info from another metacat
2958 2958
                        ForceReplicationHandler frh = new ForceReplicationHandler(
2959
                                docid, "insert", false, null, username, request.getRemoteAddr());
2959
                                docid, "insert", false, null);
2960 2960

  
2961 2961
                        // set content type and other response header fields
2962 2962
                        // first

Also available in: Unified diff