| Issue 1227: | Submit doesn't work for cherry-picked changes | |
| 1 person starred this issue and may be notified of changes. | Back to list |
Affected Version: b43c3b003cb54eca857c691467f409d257eb65a8 What steps will reproduce the problem? 1. Upload a patch 2. Change it 3. Upload again 4. Submit Please provide any additional information below. [2012-01-04 15:47:30,051] ERROR com.google.gerrit.server.git.ChangeMergeQueue : Merge attempt for GWApp,refs/heads/sbc-term failed java.lang.NullPointerException at com.google.gerrit.server.git.MergeOp.setMerged(MergeOp.java:1374) at com.google.gerrit.server.git.MergeOp.updateChangeStatus(MergeOp.java:1064) at com.google.gerrit.server.git.MergeOp.merge(MergeOp.java:268) at com.google.gerrit.server.git.ChangeMergeQueue.mergeImpl(ChangeMergeQueue.java:176) at com.google.gerrit.server.git.ChangeMergeQueue.merge(ChangeMergeQueue.java:96) at com.google.gerrit.server.ChangeUtil.submit(ChangeUtil.java:192) at com.google.gerrit.httpd.rpc.changedetail.SubmitAction.call(SubmitAction.java:84) at com.google.gerrit.httpd.rpc.changedetail.SubmitAction.call(SubmitAction.java:37) at com.google.gerrit.httpd.rpc.Handler.to(Handler.java:65) at com.google.gerrit.httpd.rpc.changedetail.ChangeManageServiceImpl.submit(ChangeManageServiceImpl.java:42) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) at java.lang.reflect.Method.invoke(Unknown Source) at com.google.gwtjsonrpc.server.MethodHandle.invoke(MethodHandle.java:91) at com.google.gwtjsonrpc.server.JsonServlet.doService(JsonServlet.java:382) at com.google.gwtjsonrpc.server.JsonServlet.service(JsonServlet.java:268) at javax.servlet.http.HttpServlet.service(HttpServlet.java:717) at com.google.inject.servlet.ServletDefinition.doService(ServletDefinition.java:216) at com.google.inject.servlet.ServletDefinition.service(ServletDefinition.java:141) at com.google.inject.servlet.ManagedServletPipeline.service(ManagedServletPipeline.java:93) at com.google.inject.servlet.FilterChainInvocation.doFilter(FilterChainInvocation.java:63) at com.google.inject.servlet.FilterDefinition.doFilter(FilterDefinition.java:134) at com.google.inject.servlet.FilterChainInvocation.doFilter(FilterChainInvocation.java:59) at com.google.inject.servlet.FilterDefinition.doFilter(FilterDefinition.java:134) at com.google.inject.servlet.FilterChainInvocation.doFilter(FilterChainInvocation.java:59) at com.google.inject.servlet.FilterDefinition.doFilter(FilterDefinition.java:134) at com.google.inject.servlet.FilterChainInvocation.doFilter(FilterChainInvocation.java:59) at com.google.gwtexpui.server.CacheControlFilter.doFilter(CacheControlFilter.java:76) at com.google.inject.servlet.FilterDefinition.doFilter(FilterDefinition.java:129) at com.google.inject.servlet.FilterChainInvocation.doFilter(FilterChainInvocation.java:59) at com.google.gerrit.httpd.RequestCleanupFilter.doFilter(RequestCleanupFilter.java:54) at com.google.inject.servlet.FilterDefinition.doFilter(FilterDefinition.java:129) at com.google.inject.servlet.FilterChainInvocation.doFilter(FilterChainInvocation.java:59) at com.google.inject.servlet.ManagedFilterPipeline.dispatch(ManagedFilterPipeline.java:122) at com.google.inject.servlet.GuiceFilter.doFilter(GuiceFilter.java:110) at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1322) at org.eclipse.jetty.servlet.ServletHandler.doHandle(ServletHandler.java:473) at org.eclipse.jetty.server.handler.ContextHandler.doHandle(ContextHandler.java:921) at org.eclipse.jetty.servlet.ServletHandler.doScope(ServletHandler.java:403) at org.eclipse.jetty.server.handler.ContextHandler.doScope(ContextHandler.java:856) at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:117) at org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:114) at org.eclipse.jetty.server.handler.RequestLogHandler.handle(RequestLogHandler.java:59) at com.google.gerrit.pgm.http.jetty.JettyServer$1.handle(JettyServer.java:139) at org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:114) at org.eclipse.jetty.server.Server.handle(Server.java:352) at org.eclipse.jetty.server.HttpConnection.handleRequest(HttpConnection.java:596) at org.eclipse.jetty.server.HttpConnection$RequestHandler.content(HttpConnection.java:1069) at org.eclipse.jetty.http.HttpParser.parseNext(HttpParser.java:805) at org.eclipse.jetty.http.HttpParser.parseAvailable(HttpParser.java:218) at org.eclipse.jetty.server.HttpConnection.handle(HttpConnection.java:426) at org.eclipse.jetty.io.nio.SelectChannelEndPoint.handle(SelectChannelEndPoint.java:510) at org.eclipse.jetty.io.nio.SelectChannelEndPoint.access$000(SelectChannelEndPoint.java:34) at org.eclipse.jetty.io.nio.SelectChannelEndPoint$1.run(SelectChannelEndPoint.java:40) at org.eclipse.jetty.util.thread.QueuedThreadPool$2.run(QueuedThreadPool.java:450) at java.lang.Thread.run(Unknown Source) Could it be related to #1206
Jan 5, 2012
#1
org...@gmail.com
Jan 5, 2012
Which merge strategy is configured for this project? Is it 'Cherry Pick'? At the moment there is a change in review that fixes a NPE that occurs in MergeOp when 'Cherry Pick' is used [1]. Maybe this is the problem that you are facing here. [1] https://gerrit-review.googlesource.com/30754 (not publicly accessable at the moment)
Jan 5, 2012
Cherry-pick indeed.
Jan 5, 2012
Yes this should get fixed with the change Edwin linked to. Sop pointed out a mistake I made in that change, I'm going to upload a new version today. Sorry for the trouble!
Summary:
Submit doesn't work for cherry-picked changes
Owner: bklarson@gmail.com Labels: -Priority-Minor Priority-Major
Jan 5, 2012
Well, currently it works for cherry-picked changes if the patch set is #1. I'm not sure it's the same issue...
Jan 11, 2012
This should now be fixed, could you let me know if you still see the problem with code at tips?
Status:
Submitted
Labels: FixedIn-2.2.2
Jan 12, 2012
Still doesn't work.
Jan 12, 2012
(No comment was entered for this change.)
Jan 12, 2012
Ok, it might have failed because it was uploaded before I upgraded gerrit, and approved afterwards. It does seem to work now. I'll update if it fails again. Thanks! |
|
| ► Sign in to add a comment |