Ignore:
Timestamp:
Mar 26, 2011, 8:39:20 PM (14 years ago)
Author:
dmik
Message:

trunk: Merged in openjdk6 b22 from branches/vendor/oracle.

Location:
trunk/openjdk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk

  • trunk/openjdk/jdk/src/solaris/demo/jni/Poller/Client.java

    r2 r278  
    11/*
    2  * Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    1313 *     documentation and/or other materials provided with the distribution.
    1414 *
    15  *   - Neither the name of Sun Microsystems nor the names of its
     15 *   - Neither the name of Oracle nor the names of its
    1616 *     contributors may be used to endorse or promote products derived
    1717 *     from this software without specific prior written permission.

  • trunk/openjdk/jdk/src/solaris/demo/jni/Poller/LinkedQueue.java

    r2 r278  
    11/*
    2  * Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    1313 *     documentation and/or other materials provided with the distribution.
    1414 *
    15  *   - Neither the name of Sun Microsystems nor the names of its
     15 *   - Neither the name of Oracle nor the names of its
    1616 *     contributors may be used to endorse or promote products derived
    1717 *     from this software without specific prior written permission.

  • trunk/openjdk/jdk/src/solaris/demo/jni/Poller/Poller.c

    r2 r278  
    11/*
    2  * Copyright 1999-2000 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    1313 *     documentation and/or other materials provided with the distribution.
    1414 *
    15  *   - Neither the name of Sun Microsystems nor the names of its
     15 *   - Neither the name of Oracle nor the names of its
    1616 *     contributors may be used to endorse or promote products derived
    1717 *     from this software without specific prior written permission.
    … …  
    162162}
    163163
    164 #define MEMORY_EXCEPTION(str) throwOutOfMemoryError(env, "Poller:" ## str)
    165 #define STATE_EXCEPTION(str)  throwIllegalStateException(env, "Poller:" ## str)
     164#define MEMORY_EXCEPTION(str) throwOutOfMemoryError(env, "Poller:" str)
     165#define STATE_EXCEPTION(str)  throwIllegalStateException(env, "Poller:" str)
    166166#define INTERRUPT_EXCEPTION(str) throwInterruptedIOException(env, \
    167                                                              "Poller:" ## str)
     167                                                             "Poller:" str)
    168168jint addfd(JNIEnv *, ioevent_t *, jint, jshort);
    169169jint removefd(JNIEnv *, ioevent_t *, jint);

  • trunk/openjdk/jdk/src/solaris/demo/jni/Poller/Poller.java

    r2 r278  
    11/*
    2  * Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    1313 *     documentation and/or other materials provided with the distribution.
    1414 *
    15  *   - Neither the name of Sun Microsystems nor the names of its
     15 *   - Neither the name of Oracle nor the names of its
    1616 *     contributors may be used to endorse or promote products derived
    1717 *     from this software without specific prior written permission.

  • trunk/openjdk/jdk/src/solaris/demo/jni/Poller/PollingServer.java

    r2 r278  
    11/*
    2  * Copyright 1999-2001 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    1313 *     documentation and/or other materials provided with the distribution.
    1414 *
    15  *   - Neither the name of Sun Microsystems nor the names of its
     15 *   - Neither the name of Oracle nor the names of its
    1616 *     contributors may be used to endorse or promote products derived
    1717 *     from this software without specific prior written permission.

  • trunk/openjdk/jdk/src/solaris/demo/jni/Poller/SimpleServer.java

    r2 r278  
    11/*
    2  * Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    1313 *     documentation and/or other materials provided with the distribution.
    1414 *
    15  *   - Neither the name of Sun Microsystems nor the names of its
     15 *   - Neither the name of Oracle nor the names of its
    1616 *     contributors may be used to endorse or promote products derived
    1717 *     from this software without specific prior written permission.

  • trunk/openjdk/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c

    r2 r278  
    11/*
    2  * Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
     2 * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    1313 *     documentation and/or other materials provided with the distribution.
    1414 *
    15  *   - Neither the name of Sun Microsystems nor the names of its
     15 *   - Neither the name of Oracle nor the names of its
    1616 *     contributors may be used to endorse or promote products derived
    1717 *     from this software without specific prior written permission.
Note: See TracChangeset for help on using the changeset viewer.