diff options
| author | jmelvin <none@none> | 2012-04-16 18:09:53 -0400 |
|---|---|---|
| committer | jmelvin <none@none> | 2012-04-16 18:09:53 -0400 |
| commit | 0ac0aff48928a7655b4c902b9d7ef579390fbb15 (patch) | |
| tree | 7a77c7b95c3007d804677f8c4833b4e6969a2454 /test/sun/nio | |
| parent | e4e4007edb91dd47c2e11d779ba667fb02ba233a (diff) | |
7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6
Summary: On Mac OS X, align system property "os.arch" with Apple legacy JDKs. Also, improve os.name string matching by using .contains() method instead of .startsWith(). This fix spans multiple repositories.
Reviewed-by: dcubed, phh, ohair, katleman
Diffstat (limited to 'test/sun/nio')
| -rw-r--r-- | test/sun/nio/ch/SelProvider.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/sun/nio/ch/SelProvider.java b/test/sun/nio/ch/SelProvider.java index cae745f5b..d0682b6f2 100644 --- a/test/sun/nio/ch/SelProvider.java +++ b/test/sun/nio/ch/SelProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2012 Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -39,7 +39,7 @@ public class SelProvider { expected = "sun.nio.ch.DevPollSelectorProvider"; } else if ("Linux".equals(osname)) { expected = "sun.nio.ch.EPollSelectorProvider"; - } else if (osname.startsWith("Mac OS")) { + } else if (osname.contains("OS X")) { expected = "sun.nio.ch.KQueueSelectorProvider"; } else return; |