Skip to content

Build fixes #798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asfgit merged 2 commits into from
Sep 26, 2016
Merged

Build fixes #798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
775862e
Add missing @Override
scop Sep 25, 2016
494c85d
Java 1.7 build fix
scop Sep 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
Expand Down Expand Up @@ -312,7 +313,7 @@ enum SERVER_STATE {

private final List<ActiveMQComponent> externalComponents = new ArrayList<>();

private final Map<String, AtomicInteger> connectedClientIds = new ConcurrentHashMap();
private final ConcurrentMap<String, AtomicInteger> connectedClientIds = new ConcurrentHashMap();

// Constructors
// ---------------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions ...-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1259,6 +1259,7 @@ public RoutingStatus send(final ServerMessage message, final boolean direct, boo
return send(getCurrentTransaction(), message, direct, noAutoCreateQueue);
}

@Override
Copy link
Copy Markdown
Contributor

@clebertsuconic clebertsuconic Sep 26, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a way to avoid these on compile time, using Error Prone.

I have tried that, and I even had the changes... but we have some code generated.. we would need to ignore the generated code, or to make it also have overrides.

@scop Can we talk through IRC tomorrow, or google chat?

Copy link
Copy Markdown
Contributor Author

@scop scop Sep 27, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@clebertsuconic if you have your Error Prone changes still somewhere, maybe you can push them somewhere public, I'd be interested in taking a look?

Copy link
Copy Markdown
Contributor

@clebertsuconic clebertsuconic Sep 27, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@scop I just started my day but I guess you came up with the same changes :)

nice one!

public RoutingStatus send(Transaction tx, final ServerMessage message, final boolean direct, boolean noAutoCreateQueue) throws Exception {

// If the protocol doesn't support flow control, we have no choice other than fail the communication
Expand Down